[gtk+] x11: Only set the keymap display once



commit d1eb8cd8097871315fc497a99f0cac45bd06a67b
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jan 11 21:45:32 2018 -0500

    x11: Only set the keymap display once
    
    Not necessary to do this more than once.

 gdk/x11/gdkdisplay-x11.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 762de7f..8fc1688 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2928,9 +2928,10 @@ gdk_x11_display_get_keymap (GdkDisplay *display)
   display_x11 = GDK_X11_DISPLAY (display);
 
   if (!display_x11->keymap)
-    display_x11->keymap = g_object_new (GDK_TYPE_X11_KEYMAP, NULL);
-
-  display_x11->keymap->display = display;
+    {
+      display_x11->keymap = g_object_new (GDK_TYPE_X11_KEYMAP, NULL);
+      display_x11->keymap->display = display; /* beware of ref cycle */
+    }
 
   return display_x11->keymap;
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]