From c97aca046a4f75e73e5d82a814337eef950efce3 Mon Sep 17 00:00:00 2001 From: Jasmine Hassan Date: Mon, 5 Nov 2012 14:29:50 +0200 Subject: [autorun] use gdk_error_trap_pop_ignored() for GTK3 http://git.gnome.org/browse/nautilus/commit/?id=8dd87483bd187bfac80a606233b769c230343980 --- libcaja-private/caja-autorun.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libcaja-private/caja-autorun.c') diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c index 61adb3e0..21f71eb8 100644 --- a/libcaja-private/caja-autorun.c +++ b/libcaja-private/caja-autorun.c @@ -749,7 +749,11 @@ is_shift_pressed (void) gdk_error_trap_push (); status = XkbGetState (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), XkbUseCoreKbd, &state); +#if GTK_CHECK_VERSION(3,0,0) + gdk_error_trap_pop_ignored (); +#else gdk_error_trap_pop (); +#endif if (status == Success) { -- cgit v1.2.1