From 24efcb77afd7d5edf6d257a24e0be02e821a29c2 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Sun, 6 Jan 2019 15:05:56 +0100 Subject: tomboykeybinder: avoid 'gdk_error_trap_push/pop' and 'gdk_flush' --- src/tomboykeybinder.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/tomboykeybinder.c b/src/tomboykeybinder.c index 782531a..cfa62dd 100644 --- a/src/tomboykeybinder.c +++ b/src/tomboykeybinder.c @@ -102,7 +102,8 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin, static gboolean do_grab_key (Binding *binding) { - GdkKeymap *keymap = gdk_keymap_get_for_display (gdk_display_get_default ()); + GdkDisplay *gdk_display = gdk_display_get_default (); + GdkKeymap *keymap = gdk_keymap_get_for_display (gdk_display); GdkWindow *rootwin = gdk_get_default_root_window (); EggVirtualModifierType virtual_mods = 0; @@ -133,15 +134,15 @@ do_grab_key (Binding *binding) TRACE (g_print ("Got modmask %d\n", binding->modifiers)); - gdk_error_trap_push (); + gdk_x11_display_error_trap_push (gdk_display); grab_ungrab_with_ignorable_modifiers (rootwin, binding, TRUE /* grab */); - gdk_flush (); + gdk_display_flush (gdk_display); - if (gdk_error_trap_pop ()) { + if (gdk_x11_display_error_trap_pop (gdk_display)) { g_warning ("Binding '%s' failed!\n", binding->keystring); return FALSE; } -- cgit v1.2.1