rpms/nspluginwrapper/F-8 nspluginwrapper-0.9.91.5-sleep.patch, NONE, 1.1 nspluginwrapper.spec, 1.35, 1.36 sources, 1.9, 1.10 plugin-config-exclude.patch, 1.1, NONE

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24111

Modified Files:
	nspluginwrapper.spec sources 
Added Files:
	nspluginwrapper-0.9.91.5-sleep.patch 
Removed Files:
	plugin-config-exclude.patch 
Log Message:
* Mon Mar 31 2008 Martin Stransky <stransky at redhat.com> 0.9.91.5-18
- added mplayer to ignored plugins
- updated plugin config utility
- added sleep patch



nspluginwrapper-0.9.91.5-sleep.patch:

--- NEW FILE nspluginwrapper-0.9.91.5-sleep.patch ---
diff -up nspluginwrapper-0.9.91.5/src/npw-viewer.c.sleep nspluginwrapper-0.9.91.5/src/npw-viewer.c
--- nspluginwrapper-0.9.91.5/src/npw-viewer.c.sleep	2008-03-10 12:50:21.000000000 +0100
+++ nspluginwrapper-0.9.91.5/src/npw-viewer.c	2008-03-10 12:51:42.000000000 +0100
@@ -3039,14 +3039,14 @@ static GPollFD xt_event_poll_fd;
 static gboolean xt_event_prepare(GSource *source, gint *timeout)
 {
   int mask = XtAppPending(x_app_context);
-  return mask & XtIMXEvent;
+  return mask;
 }
 
 static gboolean xt_event_check(GSource *source)
 {
   if (xt_event_poll_fd.revents & G_IO_IN) {
 	int mask = XtAppPending(x_app_context);
-	if (mask & XtIMXEvent)
+	if (mask)
 	  return TRUE;
   }
   return FALSE;
@@ -3054,12 +3054,11 @@ static gboolean xt_event_check(GSource *
 
 static gboolean xt_event_dispatch(GSource *source, GSourceFunc callback, gpointer user_data)
 {
-  int i;
-  for (i = 0; i < 5; i++) {
+  while(1) {
 	int mask = XtAppPending(x_app_context);
-	if ((mask & XtIMXEvent) == 0)
+	if ((mask) == 0)
 	  break;
-	XtAppProcessEvent(x_app_context, XtIMXEvent);
+	XtAppProcessEvent(x_app_context, XtIMAll);
   }
   return TRUE;
 }
@@ -3073,17 +3072,6 @@ static GSourceFuncs xt_event_funcs = {
   (GSourceDummyMarshal)NULL
 };
 
-static gboolean xt_event_polling_timer_callback(gpointer user_data)
-{
-  int i;
-  for (i = 0; i < 5; i++) {
-	if ((XtAppPending(x_app_context) & (XtIMAll & ~XtIMXEvent)) == 0)
-	  break;
-	XtAppProcessEvent(x_app_context, XtIMAll & ~XtIMXEvent);
-  }
-  return TRUE;
-}
-
 // RPC events
 static GPollFD rpc_event_poll_fd;
 
@@ -3208,10 +3196,6 @@ static int do_main(int argc, char **argv
   xt_event_poll_fd.revents = 0;
   g_source_add_poll(xt_source, &xt_event_poll_fd);
 
-  gint xt_polling_timer_id = g_timeout_add(25,
-										   xt_event_polling_timer_callback,
-										   NULL);
-
   // Initialize RPC events listener
   GSource *rpc_source = g_source_new(&rpc_event_funcs, sizeof(GSource));
   if (rpc_source == NULL) {
@@ -3232,7 +3216,6 @@ static int do_main(int argc, char **argv
   gtk_main();
   D(bug("--- EXIT ---\n"));
 
-  g_source_remove(xt_polling_timer_id);
   g_source_destroy(rpc_source);
   g_source_destroy(xt_source);
 


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-8/nspluginwrapper.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- nspluginwrapper.spec	23 Jan 2008 09:27:43 -0000	1.35
+++ nspluginwrapper.spec	31 Mar 2008 14:50:04 -0000	1.36
@@ -3,7 +3,7 @@
 # NOTE: it's used only if the package is compiled with xpcom_support = 1
 %define gecko_ver 1.8.1.10
 
-%define plugin_config_version 1.8
+%define plugin_config_version 1.9
 %define plugin_config_name plugin-config-%{plugin_config_version}
 %define plugin_config_binary plugin-config
 
@@ -14,7 +14,7 @@
 %define make_debug_package 	0
 
 # Excluded plugins
-%define exclude_list 		"libtotem*:libjavaplugin*"
+%define exclude_list 		"libtotem*:libjavaplugin*:gecko-mediaplayer*:mplayerplug-in*"
 
 # Target defines
 %if "%{_target_cpu}" == "i386"
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	17%{?dist}
+Release:	18%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -83,7 +83,7 @@
 Patch6:         plugin-config-setuid.patch
 Patch7:         nspluginwrapper-0.9.91.5-npviewer-gthread.patch
 Patch8:         nspluginwrapper-0.9.91.5-shutdown.patch
-Patch9:         plugin-config-exclude.patch
+Patch9:         nspluginwrapper-0.9.91.5-sleep.patch
 License:	GPL
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -240,6 +240,11 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Mar 31 2008 Martin Stransky <stransky at redhat.com> 0.9.91.5-18
+- added mplayer to ignored plugins
+- updated plugin config utility
+- added sleep patch
+
 * Wed Jan 23 2008 Martin Stransky <stransky at redhat.com> 0.9.91.5-17
 - added java to ignored plugins (#426618)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/F-8/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	6 Nov 2007 11:57:15 -0000	1.9
+++ sources	31 Mar 2008 14:50:04 -0000	1.10
@@ -1,2 +1,2 @@
 052e5fecc36a087d1f7200bd1e44f2f0  nspluginwrapper-0.9.91.5.tar.bz2
-c1c3cc3578916b3da0b548a612b7164d  plugin-config-1.8.tar.gz
+0a00e94ba608dfea365851af9deb20dc  plugin-config-1.9.tar.gz


--- plugin-config-exclude.patch DELETED ---