[mutter] main: Clutter does not have to be initialized after the UI



commit de696780854b813f3e76c8d0e2f66847ecdaa4b6
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Mon Aug 18 16:50:05 2014 -0400

    main: Clutter does not have to be initialized after the UI
    
    I'm not sure this was ever true. Clutter can be (and should be!)
    initialized beforehand.

 src/core/main.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/src/core/main.c b/src/core/main.c
index bcf1ffa..1e60b44 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -367,19 +367,14 @@ meta_init (void)
 
   meta_main_loop = g_main_loop_new (NULL, FALSE);
 
-  meta_ui_init ();
-
   /* If we are running with wayland then we don't wait until we have
    * an X connection before initializing clutter we instead initialize
    * it earlier since we need to initialize the GL driver so the driver
    * can register any needed wayland extensions. */
   if (!meta_is_wayland_compositor ())
-    {
-      /*
-       * Clutter can only be initialized after the UI.
-       */
-      meta_clutter_init ();
-    }
+    meta_clutter_init ();
+
+  meta_ui_init ();
 
   meta_restart_init ();
 


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