[Xfce4-commits] [xfce/libxfce4ui] 05/08: Replace gdk_keymap_get_default (Bug #15781)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/libxfce4ui.

commit 1f3732957ea8234510c38ffcb763a95e5d6246b2
Author: Andre Miranda <andreldm at xfce.org>
Date:   Sun Aug 4 13:48:38 2019 -0300

    Replace gdk_keymap_get_default (Bug #15781)
---
 libxfce4kbd-private/xfce-shortcut-dialog.c   |  4 +++-
 libxfce4kbd-private/xfce-shortcuts-grabber.c | 16 ++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/libxfce4kbd-private/xfce-shortcut-dialog.c b/libxfce4kbd-private/xfce-shortcut-dialog.c
index b01354e..c3e9630 100644
--- a/libxfce4kbd-private/xfce-shortcut-dialog.c
+++ b/libxfce4kbd-private/xfce-shortcut-dialog.c
@@ -401,6 +401,7 @@ static gboolean
 xfce_shortcut_dialog_key_pressed (XfceShortcutDialog *dialog,
                                   GdkEventKey        *event)
 {
+  GdkDisplay      *display;
   GdkKeymap       *keymap;
   GdkModifierType  consumed, modifiers;
   guint            keyval, mod_mask;
@@ -412,7 +413,8 @@ xfce_shortcut_dialog_key_pressed (XfceShortcutDialog *dialog,
 
   /* Get the keyboard state */
   mod_mask = gtk_accelerator_get_default_mod_mask ();
-  keymap = gdk_keymap_get_default ();
+  display = gdk_display_get_default ();
+  keymap = gdk_keymap_get_for_display (display);
   modifiers = event->state;
 
   gdk_keymap_translate_keyboard_state (keymap, event->hardware_keycode,
diff --git a/libxfce4kbd-private/xfce-shortcuts-grabber.c b/libxfce4kbd-private/xfce-shortcuts-grabber.c
index ce1f3a5..04e1a34 100644
--- a/libxfce4kbd-private/xfce-shortcuts-grabber.c
+++ b/libxfce4kbd-private/xfce-shortcuts-grabber.c
@@ -110,6 +110,9 @@ xfce_shortcuts_grabber_class_init (XfceShortcutsGrabberClass *klass)
 static void
 xfce_shortcuts_grabber_init (XfceShortcutsGrabber *grabber)
 {
+  GdkDisplay      *display;
+  GdkKeymap       *keymap;
+
   grabber->priv = XFCE_SHORTCUTS_GRABBER_GET_PRIVATE (grabber);
   grabber->priv->keys = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
@@ -118,7 +121,9 @@ xfce_shortcuts_grabber_init (XfceShortcutsGrabber *grabber)
    * mapped because the modmap is not updated. The following function
    * updates it.
    */
-  (void) gdk_keymap_have_bidi_layouts (gdk_keymap_get_default ());
+  display = gdk_display_get_default ();
+  keymap = gdk_keymap_get_for_display (display);
+  (void) gdk_keymap_have_bidi_layouts (keymap);
 }
 
 
@@ -131,12 +136,11 @@ xfce_shortcuts_grabber_constructed (GObject *object)
 
   XfceShortcutsGrabber *grabber = XFCE_SHORTCUTS_GRABBER (object);
 
-  keymap = gdk_keymap_get_default ();
+  display = gdk_display_get_default ();
+  keymap = gdk_keymap_get_for_display (display);
   g_signal_connect (keymap, "keys-changed", G_CALLBACK (xfce_shortcuts_grabber_keys_changed),
                     grabber);
 
-  display = gdk_display_get_default ();
-
   /* Flush events before adding the event filter */
   XAllowEvents (GDK_DISPLAY_XDISPLAY (display), AsyncBoth, CurrentTime);
 
@@ -242,7 +246,7 @@ xfce_shortcuts_grabber_grab (XfceShortcutsGrabber *grabber,
 #else
   screens = gdk_display_get_n_screens (display);
 #endif
-  keymap = gdk_keymap_get_default ();
+  keymap = gdk_keymap_get_for_display (display);
 
   /* Map virtual modifiers to non-virtual modifiers */
   modifiers = key->modifiers;
@@ -434,7 +438,7 @@ xfce_shortcuts_grabber_event_filter (GdkXEvent            *gdk_xevent,
 #else
   gdk_error_trap_push ();
 #endif
-  keymap = gdk_keymap_get_default ();
+  keymap = gdk_keymap_get_for_display (display);
   mod_mask = gtk_accelerator_get_default_mod_mask ();
   modifiers = xevent->xkey.state;
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.