diff options
| author | Stefano Karapetsas <[email protected]> | 2013-11-20 03:54:22 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-11-20 03:54:22 -0800 |
| commit | ef1bad990c74e1b39e3184139c7742fa6569a612 (patch) | |
| tree | 8c15d5fee1941b34cfdb13452c5c77ec550e071f /applets | |
| parent | 6baad9dafc848b65cc469e03ea12388d98db9cd1 (diff) | |
| parent | 22dae140b0fcc7050c524ff6785673b5eee59c2b (diff) | |
| download | mate-panel-ef1bad990c74e1b39e3184139c7742fa6569a612.tar.bz2 mate-panel-ef1bad990c74e1b39e3184139c7742fa6569a612.tar.xz | |
Merge pull request #142 from NiceandGently/master
GTK3: Fix compile warning by using gdk_error_trap_pop_ignored()
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/notification_area/na-tray-child.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/applets/notification_area/na-tray-child.c b/applets/notification_area/na-tray-child.c index 93ac4bb8..d214f587 100644 --- a/applets/notification_area/na-tray-child.c +++ b/applets/notification_area/na-tray-child.c @@ -308,7 +308,11 @@ na_tray_child_new (GdkScreen *screen, gdk_error_trap_push (); result = XGetWindowAttributes (xdisplay, icon_window, &window_attributes); +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else gdk_error_trap_pop (); +#endif if (!result) /* Window already gone */ return NULL; @@ -508,7 +512,11 @@ na_tray_child_force_redraw (NaTrayChild *child) * since that is asynchronous. */ XSync (xdisplay, False); +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else gdk_error_trap_pop (); +#endif #else /* Hiding and showing is the safe way to do it, but can result in more * flickering. @@ -552,7 +560,11 @@ _get_wmclass (Display *xdisplay, gdk_error_trap_push (); XGetClassHint (xdisplay, xwindow, &ch); +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else gdk_error_trap_pop (); +#endif if (res_class) *res_class = NULL; |