From d5c82490950df12e2c0f6fd73024a10abd85cc13 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Thu, 12 Jul 2018 19:37:32 +0200 Subject: capplets/keybindings: avoid deprecated 'gdk_keymap_get_default' --- capplets/keybindings/eggaccelerators.c | 2 +- capplets/keybindings/eggcellrendererkeys.c | 4 ++-- 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, -- cgit v1.2.1