Skip to content

Commit 3fe98d7

Browse files
committed
plugins: avoid deprecated 'gdk_keymap_get_default'
1 parent b264cff commit 3fe98d7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

plugins/common/eggaccelerators.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ egg_accelerator_parse_virtual (const gchar *accelerator,
387387
GdkKeymapKey *keys;
388388
gint n_keys, i, j;
389389

390-
if (!gdk_keymap_get_entries_for_keyval (gdk_keymap_get_default(), keyval, &keys, &n_keys)) {
390+
if (!gdk_keymap_get_entries_for_keyval (gdk_keymap_get_for_display (gdk_display_get_default ()), keyval, &keys, &n_keys)) {
391391
bad_keyval = TRUE;
392392
} else {
393393
*accelerator_codes = g_new0 (guint, n_keys + 1);
@@ -647,7 +647,7 @@ egg_keymap_get_modmap (GdkKeymap *keymap)
647647
EggModmap *modmap;
648648

649649
if (keymap == NULL)
650-
keymap = gdk_keymap_get_default ();
650+
keymap = gdk_keymap_get_for_display (gdk_display_get_default ());
651651

652652
/* This is all a hack, much simpler when we can just
653653
* modify GDK directly.

plugins/common/msd-keygrab.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ setup_modifiers (void)
5858
/* NumLock can be assigned to varying keys so we need to
5959
* resolve and ignore it specially */
6060
dynmods = 0;
61-
egg_keymap_resolve_virtual_modifiers (gdk_keymap_get_default (),
61+
egg_keymap_resolve_virtual_modifiers (gdk_keymap_get_for_display (gdk_display_get_default ()),
6262
EGG_VIRTUAL_NUM_LOCK_MASK,
6363
&dynmods);
6464

@@ -222,7 +222,7 @@ match_key (Key *key, XEvent *event)
222222
group = (event->xkey.state & GDK_KEY_Mode_switch) ? 1 : 0;
223223

224224
/* Check if we find a keysym that matches our current state */
225-
if (gdk_keymap_translate_keyboard_state (gdk_keymap_get_default(), event->xkey.keycode,
225+
if (gdk_keymap_translate_keyboard_state (gdk_keymap_get_for_display (gdk_display_get_default ()), event->xkey.keycode,
226226
event->xkey.state, group,
227227
&keyval, NULL, NULL, &consumed)) {
228228
guint lower, upper;

0 commit comments

Comments
 (0)