summaryrefslogtreecommitdiff
path: root/maximus/tomboykeybinder.c
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-01-07 01:32:05 +0100
committerZenWalker <[email protected]>2019-02-07 10:11:57 +0100
commit92910b6b2dd0b75bcc99e30eb660742168cef6ce (patch)
tree1d9afce6a805eed730f11d920d6cdccc7350164a /maximus/tomboykeybinder.c
parent80bc7d79d79acdbb1f5b9b7dcb8e2b1ac7fd7884 (diff)
downloadmate-netbook-92910b6b2dd0b75bcc99e30eb660742168cef6ce.tar.bz2
mate-netbook-92910b6b2dd0b75bcc99e30eb660742168cef6ce.tar.xz
avoid deprecated 'gdk_error_trap_push/pop/pop_ignored' and 'gdk_flush'
Diffstat (limited to 'maximus/tomboykeybinder.c')
-rw-r--r--maximus/tomboykeybinder.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/maximus/tomboykeybinder.c b/maximus/tomboykeybinder.c
index 261dcb7..79ce6df 100644
--- a/maximus/tomboykeybinder.c
+++ b/maximus/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;
@@ -131,15 +132,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;
}