wayland: Don't use WESTON_LAUNCHER_SOCK

We can simply check the windowing backend.
This commit is contained in:
Jasper St. Pierre 2014-02-17 21:23:27 -05:00
parent 86f057a712
commit ef24fb6296

View File

@ -643,8 +643,10 @@ meta_wayland_init (void)
clutter_wayland_set_compositor_display (compositor->wayland_display); clutter_wayland_set_compositor_display (compositor->wayland_display);
if (getenv ("WESTON_LAUNCHER_SOCK")) #if defined(CLUTTER_WINDOWING_EGL)
if (clutter_check_windowing_backend (CLUTTER_WINDOWING_EGL))
compositor->launcher = meta_launcher_new (); compositor->launcher = meta_launcher_new ();
#endif
if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS) if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
g_error ("Failed to initialize Clutter"); g_error ("Failed to initialize Clutter");