summaryrefslogtreecommitdiff
path: root/plugins/xrandr
diff options
context:
space:
mode:
authorWolfgang Ulbrich <[email protected]>2015-11-16 14:02:19 +0100
committerWolfgang Ulbrich <[email protected]>2015-12-02 12:54:10 +0100
commit8ea8868b6e6cfa626905b52b4b94b10b60d43139 (patch)
tree8b280cf03d6569a1991f82b3449f8714bd31ebed /plugins/xrandr
parentef58118cad934b5fa5bf5ca1abe2d7f3d6f56836 (diff)
downloadmate-settings-daemon-8ea8868b6e6cfa626905b52b4b94b10b60d43139.tar.bz2
mate-settings-daemon-8ea8868b6e6cfa626905b52b4b94b10b60d43139.tar.xz
GTK3: use gdk_error_trap_pop_ignored() when appropriate
taken from: https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=544526d
Diffstat (limited to 'plugins/xrandr')
-rw-r--r--plugins/xrandr/msd-xrandr-manager.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c
index 45b243f..d77e12c 100644
--- a/plugins/xrandr/msd-xrandr-manager.c
+++ b/plugins/xrandr/msd-xrandr-manager.c
@@ -2381,7 +2381,11 @@ msd_xrandr_manager_start (MsdXrandrManager *manager,
True, GrabModeAsync, GrabModeAsync);
gdk_flush ();
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_error_trap_pop ();
+#endif
}
if (manager->priv->rotate_windows_keycode) {
@@ -2393,7 +2397,11 @@ msd_xrandr_manager_start (MsdXrandrManager *manager,
True, GrabModeAsync, GrabModeAsync);
gdk_flush ();
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_error_trap_pop ();
+#endif
}
show_timestamps_dialog (manager, "Startup");
@@ -2432,7 +2440,11 @@ msd_xrandr_manager_stop (MsdXrandrManager *manager)
manager->priv->switch_video_mode_keycode, AnyModifier,
gdk_x11_get_default_root_xwindow());
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_error_trap_pop ();
+#endif
}
if (manager->priv->rotate_windows_keycode) {
@@ -2442,7 +2454,11 @@ msd_xrandr_manager_stop (MsdXrandrManager *manager)
manager->priv->rotate_windows_keycode, AnyModifier,
gdk_x11_get_default_root_xwindow());
+#if GTK_CHECK_VERSION (3, 0, 0)
+ gdk_error_trap_pop_ignored ();
+#else
gdk_error_trap_pop ();
+#endif
}
gdk_window_remove_filter (gdk_get_default_root_window (),