summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2018-07-12 19:37:32 +0200
committerZenWalker <[email protected]>2018-07-14 01:20:27 +0200
commitd5c82490950df12e2c0f6fd73024a10abd85cc13 (patch)
tree8054f935c36a2458170cf804712275d8df41d4ee
parent657b7067acfa3ee0212a08f266b7ebdd60f92c63 (diff)
downloadmate-control-center-d5c82490950df12e2c0f6fd73024a10abd85cc13.tar.bz2
mate-control-center-d5c82490950df12e2c0f6fd73024a10abd85cc13.tar.xz
capplets/keybindings: avoid deprecated 'gdk_keymap_get_default'
-rw-r--r--capplets/keybindings/eggaccelerators.c2
-rw-r--r--capplets/keybindings/eggcellrendererkeys.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/capplets/keybindings/eggaccelerators.c b/capplets/keybindings/eggaccelerators.c
index 03ffca71..32cbc7b3 100644
--- a/capplets/keybindings/eggaccelerators.c
+++ b/capplets/keybindings/eggaccelerators.c
@@ -607,7 +607,7 @@ egg_keymap_get_modmap (GdkKeymap *keymap)
EggModmap *modmap;
if (keymap == NULL)
- keymap = gdk_keymap_get_default ();
+ keymap = gdk_keymap_get_for_display (gdk_display_get_default ());
/* This is all a hack, much simpler when we can just
* modify GDK directly.
diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c
index 828c1fab..938e4d1f 100644
--- a/capplets/keybindings/eggcellrendererkeys.c
+++ b/capplets/keybindings/eggcellrendererkeys.c
@@ -391,7 +391,7 @@ static gboolean grab_key_callback(GtkWidget* widget, GdkEventKey* event, void* d
cleared = FALSE;
consumed_modifiers = 0;
- gdk_keymap_translate_keyboard_state(gdk_keymap_get_default(),
+ gdk_keymap_translate_keyboard_state (gdk_keymap_get_for_display (gdk_display_get_default ()),
event->hardware_keycode,
event->state,
event->group,
@@ -411,7 +411,7 @@ static gboolean grab_key_callback(GtkWidget* widget, GdkEventKey* event, void* d
consumed_modifiers &= ~(GDK_SHIFT_MASK);
}
- egg_keymap_resolve_virtual_modifiers(gdk_keymap_get_default(),
+ egg_keymap_resolve_virtual_modifiers (gdk_keymap_get_for_display (gdk_display_get_default ()),
EGG_VIRTUAL_NUM_LOCK_MASK |
EGG_VIRTUAL_SCROLL_LOCK_MASK |
EGG_VIRTUAL_LOCK_MASK,