[gtk+] x11: Move initialization code



commit 0122a9da8eab518652553aa4e777d5caf18a6163
Author: Benjamin Otte <otte redhat com>
Date:   Wed May 1 18:11:26 2013 +0200

    x11: Move initialization code
    
    Move it from GdkDisplayManagerX11.init to GdkDisplay.class_init.
    
    This shouldn't cause any problems, but who knows, so keep this patch
    small.
    
    Reason for this is the unification of display managers.

 gdk/x11/gdkdisplay-x11.c        |    2 ++
 gdk/x11/gdkdisplaymanager-x11.c |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index 9ca1bd7..f354132 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -2824,4 +2824,6 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
   display_class->convert_selection = _gdk_x11_display_convert_selection;
   display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list;
   display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target;
+
+  _gdk_x11_windowing_init ();
 }
diff --git a/gdk/x11/gdkdisplaymanager-x11.c b/gdk/x11/gdkdisplaymanager-x11.c
index 5393cad..1be6a51 100644
--- a/gdk/x11/gdkdisplaymanager-x11.c
+++ b/gdk/x11/gdkdisplaymanager-x11.c
@@ -75,7 +75,6 @@ g_initable_iface_init (GInitableIface *iface)
 static void
 gdk_x11_display_manager_init (GdkX11DisplayManager *manager)
 {
-  _gdk_x11_windowing_init ();
 }
 
 static void


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