summaryrefslogtreecommitdiff
path: root/libcaja-private/caja-autorun.c
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-11-05 14:29:50 +0200
committerJasmine Hassan <[email protected]>2012-11-16 09:45:50 +0200
commitc97aca046a4f75e73e5d82a814337eef950efce3 (patch)
tree3044935fdbcca98e09afb498367ddd0040fbbb0f /libcaja-private/caja-autorun.c
parent0d0641f10e84e0de0b39e63789508c260913cc98 (diff)
downloadcaja-c97aca046a4f75e73e5d82a814337eef950efce3.tar.bz2
caja-c97aca046a4f75e73e5d82a814337eef950efce3.tar.xz
[autorun] use gdk_error_trap_pop_ignored() for GTK3
http://git.gnome.org/browse/nautilus/commit/?id=8dd87483bd187bfac80a606233b769c230343980
Diffstat (limited to 'libcaja-private/caja-autorun.c')
-rw-r--r--libcaja-private/caja-autorun.c4
1 files changed, 4 insertions, 0 deletions
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)
{