summaryrefslogtreecommitdiff
path: root/capplets
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-01-14 11:33:00 +0300
committermonsta <[email protected]>2016-01-14 11:33:00 +0300
commit1ebc7ac9b310e2f8ccd948f65b8092c4575c3623 (patch)
treebea7bbbc01d11caf045555df061495b211793d2b /capplets
parentdaace0c5a8db3a12cff21056813cb8cc1a68ab19 (diff)
downloadmate-control-center-1ebc7ac9b310e2f8ccd948f65b8092c4575c3623.tar.bz2
mate-control-center-1ebc7ac9b310e2f8ccd948f65b8092c4575c3623.tar.xz
mouse: use gdk_error_trap_pop_ignored in GTK+3 build
Diffstat (limited to 'capplets')
-rw-r--r--capplets/mouse/mate-mouse-properties.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/capplets/mouse/mate-mouse-properties.c b/capplets/mouse/mate-mouse-properties.c
index 8e638509..88555d3b 100644
--- a/capplets/mouse/mate-mouse-properties.c
+++ b/capplets/mouse/mate-mouse-properties.c
@@ -290,7 +290,12 @@ synaptics_check_capabilities (GtkBuilder *dialog)
XFree (data);
}
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_error_trap_pop ();
+#endif
XCloseDevice (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), device);
}
@@ -341,7 +346,12 @@ find_synaptics (void)
XFree (data);
ret = TRUE;
}
+
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_error_trap_pop ();
+#endif
XCloseDevice (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), device);