summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-01-06 15:05:56 +0100
committerZenWalker <[email protected]>2019-02-07 10:12:17 +0100
commit24efcb77afd7d5edf6d257a24e0be02e821a29c2 (patch)
treefc3e7291acd2f2205b20aaeeba643fb8e462d907
parent921f460eb4476282728084adc0f6e3b5c1a89708 (diff)
downloadmate-indicator-applet-24efcb77afd7d5edf6d257a24e0be02e821a29c2.tar.bz2
mate-indicator-applet-24efcb77afd7d5edf6d257a24e0be02e821a29c2.tar.xz
tomboykeybinder: avoid 'gdk_error_trap_push/pop' and 'gdk_flush'
-rw-r--r--src/tomboykeybinder.c9
1 files changed, 5 insertions, 4 deletions
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;
}