1
0
Fork 0

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.
This commit is contained in:
Jasper St. Pierre 2014-08-18 16:50:05 -04:00
parent 5f7b81eb95
commit de69678085

View file

@ -367,19 +367,14 @@ meta_init (void)
meta_main_loop = g_main_loop_new (NULL, FALSE); 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 /* If we are running with wayland then we don't wait until we have
* an X connection before initializing clutter we instead initialize * an X connection before initializing clutter we instead initialize
* it earlier since we need to initialize the GL driver so the driver * it earlier since we need to initialize the GL driver so the driver
* can register any needed wayland extensions. */ * can register any needed wayland extensions. */
if (!meta_is_wayland_compositor ()) 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 (); meta_restart_init ();