From 8ea8868b6e6cfa626905b52b4b94b10b60d43139 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Mon, 16 Nov 2015 14:02:19 +0100 Subject: GTK3: use gdk_error_trap_pop_ignored() when appropriate taken from: https://git.gnome.org/browse/gnome-settings-daemon/commit/?id=544526d --- plugins/xrandr/msd-xrandr-manager.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'plugins/xrandr/msd-xrandr-manager.c') 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 (), -- cgit v1.2.1