rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.5-shutdown.patch, NONE, 1.1 nspluginwrapper.spec, 1.38, 1.39

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21495

Modified Files:
	nspluginwrapper.spec 
Added Files:
	nspluginwrapper-0.9.91.5-shutdown.patch 
Log Message:
* Mon Jan 14 2008 Martin Stransky <stransky at redhat.com> 0.9.91.5-20
- fixed #426176 - Orphaned npviewer.bin processes



nspluginwrapper-0.9.91.5-shutdown.patch:

--- NEW FILE nspluginwrapper-0.9.91.5-shutdown.patch ---
diff -up nspluginwrapper-0.9.91.5/src/npw-viewer.c.old nspluginwrapper-0.9.91.5/src/npw-viewer.c
--- nspluginwrapper-0.9.91.5/src/npw-viewer.c.old	2008-01-14 13:28:57.000000000 +0100
+++ nspluginwrapper-0.9.91.5/src/npw-viewer.c	2008-01-14 13:30:35.000000000 +0100
@@ -3112,6 +3112,12 @@ static GSourceFuncs rpc_event_funcs = {
   (GSourceDummyMarshal)NULL
 };
 
+static void plugin_kill(rpc_connection_t *connection)
+{
+  D(bug("plugin_kill, connection %p\n",connection));
+  gtk_main_quit();
+}
+
 
 /* ====================================================================== */
 /* === Main program                                                   === */
@@ -3220,6 +3226,9 @@ static int do_main(int argc, char **argv
   g_source_set_callback(rpc_source, (GSourceFunc)rpc_dispatch, g_rpc_connection, NULL);
   g_source_add_poll(rpc_source, &rpc_event_poll_fd);
 
+  // Set error handler - stop plugin if there's a connection error
+  rpc_connection_error_callback_set(g_rpc_connection, plugin_kill);
+ 
   gtk_main();
   D(bug("--- EXIT ---\n"));
 


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- nspluginwrapper.spec	10 Jan 2008 12:24:40 -0000	1.38
+++ nspluginwrapper.spec	14 Jan 2008 13:21:13 -0000	1.39
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	19%{?dist}
+Release:	20%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -82,6 +82,7 @@
 Patch5:         nspluginwrapper-0.9.91.5-fork.patch
 Patch6:         nspluginwrapper-0.9.91.5-xulrunner.patch
 Patch7:         nspluginwrapper-0.9.91.5-npviewer-gthread.patch
+Patch8:         nspluginwrapper-0.9.91.5-shutdown.patch
 Patch10:        plugin-config-setuid.patch
 License:	GPL
 Group:		Networking/WWW
@@ -113,6 +114,7 @@
 %patch5 -p1
 %patch6 -p1 -b .xl
 %patch7 -p1 -b .thread
+%patch8 -p1 -b .shutdown
 
 pushd %plugin_config_name
 %patch10 -p2
@@ -235,6 +237,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Jan 14 2008 Martin Stransky <stransky at redhat.com> 0.9.91.5-20
+- fixed #426176 - Orphaned npviewer.bin processes
+
 * Thu Jan 10 2008 Martin Stransky <stransky at redhat.com> 0.9.91.5-19
 - xulrunner rebuild
 - fixed build script, added gthread-2.0