diff options
| author | Pablo Barciela <[email protected]> | 2018-07-13 01:03:15 +0200 |
|---|---|---|
| committer | Pablo Barciela <[email protected]> | 2018-07-13 01:03:15 +0200 |
| commit | 3fe98d7d01238bfacd793110b4b2c8b9a8d93609 (patch) | |
| tree | 836e458ae732c18d7ec48801c327689f1653af62 | |
| parent | b264cffba61776d0fa87754400f8baf83d15f5a0 (diff) | |
| download | mate-settings-daemon-3fe98d7d01238bfacd793110b4b2c8b9a8d93609.tar.bz2 mate-settings-daemon-3fe98d7d01238bfacd793110b4b2c8b9a8d93609.tar.xz | |
plugins: avoid deprecated 'gdk_keymap_get_default'
| -rw-r--r-- | plugins/common/eggaccelerators.c | 4 | ||||
| -rw-r--r-- | plugins/common/msd-keygrab.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/common/eggaccelerators.c b/plugins/common/eggaccelerators.c index 0b32887..9662a3f 100644 --- a/plugins/common/eggaccelerators.c +++ b/plugins/common/eggaccelerators.c @@ -387,7 +387,7 @@ egg_accelerator_parse_virtual (const gchar *accelerator, GdkKeymapKey *keys; gint n_keys, i, j; - if (!gdk_keymap_get_entries_for_keyval (gdk_keymap_get_default(), keyval, &keys, &n_keys)) { + if (!gdk_keymap_get_entries_for_keyval (gdk_keymap_get_for_display (gdk_display_get_default ()), keyval, &keys, &n_keys)) { bad_keyval = TRUE; } else { *accelerator_codes = g_new0 (guint, n_keys + 1); @@ -647,7 +647,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/plugins/common/msd-keygrab.c b/plugins/common/msd-keygrab.c index 2a486fb..a0f4105 100644 --- a/plugins/common/msd-keygrab.c +++ b/plugins/common/msd-keygrab.c @@ -58,7 +58,7 @@ setup_modifiers (void) /* NumLock can be assigned to varying keys so we need to * resolve and ignore it specially */ dynmods = 0; - 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, &dynmods); @@ -222,7 +222,7 @@ match_key (Key *key, XEvent *event) group = (event->xkey.state & GDK_KEY_Mode_switch) ? 1 : 0; /* Check if we find a keysym that matches our current state */ - if (gdk_keymap_translate_keyboard_state (gdk_keymap_get_default(), event->xkey.keycode, + if (gdk_keymap_translate_keyboard_state (gdk_keymap_get_for_display (gdk_display_get_default ()), event->xkey.keycode, event->xkey.state, group, &keyval, NULL, NULL, &consumed)) { guint lower, upper; |