Attachment 297045 Details for Bug 426968 – experimental patch

[patch] experimental patch

nspluginwrapper-0.9.91.5-sleep.patch (text/plain), 2.02 KB, created by Martin Stransky on 2008-03-06 13:20:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Stransky

Created: 2008-03-06 13:20:39 UTC

Size: 2.02 KB

patch

obsolete

>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-03-06 13:51:03.000000000 +0100
>+++ nspluginwrapper-0.9.91.5/src/npw-viewer.c	2008-03-06 14:00:05.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;
>@@ -3057,9 +3057,9 @@ static gboolean xt_event_dispatch(GSourc
>   int i;
>   for (i = 0; i < 5; i++) {
> 	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 +3073,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 +3197,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 +3217,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);
>

Actions: View | Diff

Attachments on bug 426968: 297045