rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.5-browser-check.patch, NONE, 1.1 nspluginwrapper.spec, 1.18, 1.19

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	nspluginwrapper.spec 
Added Files:
	nspluginwrapper-0.9.91.5-browser-check.patch 
Log Message:
* Mon Oct 1 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-4
- quit the plugin when browser crashes (#290901)



nspluginwrapper-0.9.91.5-browser-check.patch:

--- NEW FILE nspluginwrapper-0.9.91.5-browser-check.patch ---
diff -up nspluginwrapper-0.9.91.5/src/npw-viewer.c.check nspluginwrapper-0.9.91.5/src/npw-viewer.c
--- nspluginwrapper-0.9.91.5/src/npw-viewer.c.check	2007-10-01 15:23:06.000000000 +0200
+++ nspluginwrapper-0.9.91.5/src/npw-viewer.c	2007-10-01 15:21:32.000000000 +0200
@@ -2902,6 +2902,17 @@ static int handle_NPP_Print(rpc_connecti
   return rpc_method_send_reply(connection, RPC_TYPE_BOOLEAN, plugin_printed, RPC_TYPE_INVALID);
 }
 
+static int plugin_rpc_connection_check(void)
+{
+  if (rpc_status(g_rpc_connection) != RPC_STATUS_ACTIVE) {
+	// Kill the plugin
+	gtk_main_quit();
+	return(FALSE);
+  }
+  else {
+	return(TRUE);
+  }
+}
 
 /* ====================================================================== */
 /* === Events processing                                              === */
@@ -2960,7 +2971,7 @@ static gboolean xt_event_polling_timer_c
 	  break;
 	XtAppProcessEvent(x_app_context, XtIMAll & ~XtIMXEvent);
   }
-  return TRUE;
+  return plugin_rpc_connection_check();
 }
 
 // RPC events


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nspluginwrapper.spec	21 Sep 2007 08:03:20 -0000	1.18
+++ nspluginwrapper.spec	1 Oct 2007 13:41:47 -0000	1.19
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	3%{?dist}
+Release:	4%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -79,6 +79,7 @@
 Patch1:		nspluginwrapper-0.9.91.5-restart.patch
 Patch2:		nspluginwrapper-0.9.91.5-rh.patch
 Patch3:		nspluginwrapper-0.9.91.4-config.patch
+Patch4:		nspluginwrapper-0.9.91.5-browser-check.patch
 License:	GPL
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -108,8 +109,9 @@
 %setup  -q -a 1
 %patch0 -p0
 %patch1 -p0
-%patch2 -p1 -b .rh
-%patch3 -p1 -b .cnf
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 # remove old/incompatibile stuff
 rm -rf npapi
@@ -227,6 +229,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Oct 1 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-4
+- quit the plugin when browser crashes (#290901)
+
 * Fri Sep 21 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-3
 - added original plugin dir to the package