summaryrefslogtreecommitdiff
path: root/mate-panel
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2013-11-16 23:00:19 +0100
committerraveit65 <[email protected]>2013-11-16 23:00:19 +0100
commit22dae140b0fcc7050c524ff6785673b5eee59c2b (patch)
tree8c15d5fee1941b34cfdb13452c5c77ec550e071f /mate-panel
parent6baad9dafc848b65cc469e03ea12388d98db9cd1 (diff)
downloadmate-panel-22dae140b0fcc7050c524ff6785673b5eee59c2b.tar.bz2
mate-panel-22dae140b0fcc7050c524ff6785673b5eee59c2b.tar.xz
GTK3: Fix compile warning by using gdk_error_trap_pop_ignored()
Diffstat (limited to 'mate-panel')
-rw-r--r--mate-panel/panel-force-quit.c4
-rw-r--r--mate-panel/panel-xutils.c12
-rw-r--r--mate-panel/xstuff.c4
3 files changed, 20 insertions, 0 deletions
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));