Neil J. Patel has proposed merging
lp:~indicator-applet-developers/indicator-appmenu/catch-xerrors-correctly into
lp:indicator-appmenu.
Requested reviews:
Indicator Applet Developers (indicator-applet-developers)
This catches xerrors properly
--
https://code.launchpad.net/~indicator-applet-developers/indicator-appmenu/catch-xerrors-correctly/+merge/36062
Your team ayatana-commits is subscribed to branch lp:indicator-appmenu.
=== modified file 'src/gdk-get-func.c'
--- src/gdk-get-func.c 2010-09-16 12:39:02 +0000
+++ src/gdk-get-func.c 2010-09-20 19:37:48 +0000
@@ -94,10 +94,13 @@
hints_atom = gdk_x11_get_xatom_by_name_for_display (display, _XA_MOTIF_WM_HINTS);
+ gdk_error_trap_push ();
XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), window,
hints_atom, 0, sizeof (MotifWmHints)/sizeof (long),
False, AnyPropertyType, &type, &format, &nitems,
&bytes_after, &data);
+ gdk_flush ();
+ gdk_error_trap_pop ();
if (type == None)
return NULL;
=== modified file 'src/indicator-appmenu.c'
--- src/indicator-appmenu.c 2010-09-16 18:51:04 +0000
+++ src/indicator-appmenu.c 2010-09-20 19:37:48 +0000
@@ -428,6 +428,7 @@
False,
SubstructureRedirectMask | SubstructureNotifyMask,
&xev);
+ gdk_flush ();
gdk_error_trap_pop ();
return;
_______________________________________________
Mailing list: https://launchpad.net/~ayatana-commits
Post to : ayatana-commits@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ayatana-commits
More help : https://help.launchpad.net/ListHelp
