[gtk+] display: Add display to displaymanager later



commit 01c6ecfb78bb36ec9ab65a30a5f9c25e4ba71bc3
Author: Benjamin Otte <otte redhat com>
Date:   Wed Apr 17 22:56:22 2013 +0100

    display: Add display to displaymanager later
    
    Instead of GdkDisplay::init, only add the display to the display manager
    in GdkDisplay::opened. This avoids spurious changes of the default
    display in gtk_init() when we're trying to find the one that works and
    try to open lots of different ones.

 gdk/gdkdisplay.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c
index d8fe13e..1c14d3e 100644
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -108,6 +108,8 @@ gdk_display_real_opened (GdkDisplay *display)
 
   g_signal_connect (device_manager, "device-removed",
                     G_CALLBACK (device_removed_cb), display);
+
+  _gdk_display_manager_add_display (gdk_display_manager_get (), display);
 }
 
 static void
@@ -206,8 +208,6 @@ gdk_display_init (GdkDisplay *display)
 
   display->multiple_click_info = g_hash_table_new_full (NULL, NULL, NULL,
                                                         (GDestroyNotify) g_free);
-
-  _gdk_display_manager_add_display (gdk_display_manager_get (), display);
 }
 
 static void


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