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/keyboard/msd-keyboard-manager.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'plugins/keyboard') diff --git a/plugins/keyboard/msd-keyboard-manager.c b/plugins/keyboard/msd-keyboard-manager.c index 8d261b6..8558a54 100644 --- a/plugins/keyboard/msd-keyboard-manager.c +++ b/plugins/keyboard/msd-keyboard-manager.c @@ -312,7 +312,11 @@ apply_settings (GSettings *settings, #endif /* HAVE_X11_EXTENSIONS_XKB_H */ XSync (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), FALSE); +#if GTK_CHECK_VERSION (3, 0, 0) + gdk_error_trap_pop_ignored (); +#else gdk_error_trap_pop (); +#endif } void -- cgit v1.2.1