From 22dae140b0fcc7050c524ff6785673b5eee59c2b Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Sat, 16 Nov 2013 23:00:19 +0100
Subject: GTK3: Fix compile warning by using gdk_error_trap_pop_ignored()

---
 applets/notification_area/na-tray-child.c | 12 ++++++++++++
 libmate-panel-applet/mate-panel-applet.c  |  4 ++++
 mate-panel/panel-force-quit.c             |  4 ++++
 mate-panel/panel-xutils.c                 | 12 ++++++++++++
 mate-panel/xstuff.c                       |  4 ++++
 5 files changed, 36 insertions(+)

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;
diff --git a/libmate-panel-applet/mate-panel-applet.c b/libmate-panel-applet/mate-panel-applet.c
index 33ec6f15..3c03bfd1 100644
--- a/libmate-panel-applet/mate-panel-applet.c
+++ b/libmate-panel-applet/mate-panel-applet.c
@@ -961,7 +961,11 @@ mate_panel_applet_button_event (GtkWidget      *widget,
 		    False, NoEventMask, &xevent);
 
 	gdk_flush ();
+#if GTK_CHECK_VERSION (3, 0, 0)
+	gdk_error_trap_pop_ignored ();
+#else
 	gdk_error_trap_pop ();
+#endif
 
 	return TRUE;
 }
diff --git a/mate-panel/panel-force-quit.c b/mate-panel/panel-force-quit.c
index b86517e4..34fd8ee2 100644
--- a/mate-panel/panel-force-quit.c
+++ b/mate-panel/panel-force-quit.c
@@ -194,7 +194,11 @@ kill_window_response (GtkDialog *dialog,
 		gdk_error_trap_push ();
 		XKillClient (display, window);
 		gdk_flush ();
+#if GTK_CHECK_VERSION (3, 0, 0)
+		gdk_error_trap_pop_ignored ();
+#else
 		gdk_error_trap_pop ();
+#endif
 	}
 
 	gtk_widget_destroy (GTK_WIDGET (dialog));
diff --git a/mate-panel/panel-xutils.c b/mate-panel/panel-xutils.c
index e970fb37..ccf68116 100644
--- a/mate-panel/panel-xutils.c
+++ b/mate-panel/panel-xutils.c
@@ -86,7 +86,11 @@ panel_xutils_set_window_type (GdkWindow             *gdk_window,
 	XChangeProperty (display, window, net_wm_window_type,
 			 XA_ATOM, 32, PropModeReplace,
 			 (guchar *) &atoms, i);
+#if GTK_CHECK_VERSION (3, 0, 0)
+	gdk_error_trap_pop_ignored ();
+#else
 	gdk_error_trap_pop ();
+#endif
 }
 
 enum {
@@ -159,7 +163,11 @@ panel_xutils_set_strut (GdkWindow        *gdk_window,
 	XChangeProperty (display, window, net_wm_strut_partial,
 			 XA_CARDINAL, 32, PropModeReplace,
 			 (guchar *) &struts, 12);
+#if GTK_CHECK_VERSION (3, 0, 0)
+	gdk_error_trap_pop_ignored ();
+#else
 	gdk_error_trap_pop ();
+#endif
 }
 
 void
@@ -181,7 +189,11 @@ panel_warp_pointer (GdkWindow *gdk_window,
 
 	gdk_error_trap_push ();
 	XWarpPointer (display, None, window, 0, 0, 0, 0, x, y);
+#if GTK_CHECK_VERSION (3, 0, 0)
+	gdk_error_trap_pop_ignored ();
+#else
 	gdk_error_trap_pop ();
+#endif
 }
 
 guint
diff --git a/mate-panel/xstuff.c b/mate-panel/xstuff.c
index 2b54e293..d31f6d97 100644
--- a/mate-panel/xstuff.c
+++ b/mate-panel/xstuff.c
@@ -225,7 +225,11 @@ xstuff_set_pos_size (GdkWindow *window, int x, int y, int w, int h)
 	gdk_window_move_resize (window, x, y, w, h);
 
 	gdk_flush ();
+#if GTK_CHECK_VERSION (3, 0, 0)
+	gdk_error_trap_pop_ignored ();
+#else
 	gdk_error_trap_pop ();
+#endif
 
 	g_object_set_data (G_OBJECT (window), "xstuff-cached-x", GINT_TO_POINTER (x));
 	g_object_set_data (G_OBJECT (window), "xstuff-cached-y", GINT_TO_POINTER (y));
-- 
cgit v1.2.1