[gtk+/wip/matthiasc/debug-cleanup] x11: Only set the keymap display once



commit b52432a33b98a5230a16bba30c8f39ee57481e44
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 ddffd33..edf18ab 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2927,9 +2927,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]