[mutter/wayland] wayland: Don't use WESTON_LAUNCHER_SOCK
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] wayland: Don't use WESTON_LAUNCHER_SOCK
- Date: Tue, 18 Feb 2014 02:50:54 +0000 (UTC)
commit ef24fb6296132eee156e69df8e244dd08e008e8c
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Feb 17 21:23:27 2014 -0500
wayland: Don't use WESTON_LAUNCHER_SOCK
We can simply check the windowing backend.
src/wayland/meta-wayland.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/wayland/meta-wayland.c b/src/wayland/meta-wayland.c
index 6b6c1fe..3a32dee 100644
--- a/src/wayland/meta-wayland.c
+++ b/src/wayland/meta-wayland.c
@@ -643,8 +643,10 @@ meta_wayland_init (void)
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 ();
+#endif
if (clutter_init (NULL, NULL) != CLUTTER_INIT_SUCCESS)
g_error ("Failed to initialize Clutter");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]