From 4bb1d8f390284de9ddf3d331e1b8ff204a768f6a Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Mon, 17 Mar 2014 13:52:12 +0000 Subject: [PATCH] @bugfix: Only load external compositing modules if we are wayland-only @bugfix: Initialize e_comp_wl if we are wayland-only OR supporting wayland clients. Signed-off-by: Chris Michael --- src/bin/e_comp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 8755f0832..0667e4f9c 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1115,8 +1115,7 @@ e_comp_init(void) actions = eina_list_append(actions, act); } - -#ifdef HAVE_WAYLAND_CLIENTS +#ifdef HAVE_WAYLAND_ONLY { const char *eng; @@ -1131,11 +1130,12 @@ e_comp_init(void) } } #endif + #ifndef HAVE_WAYLAND_ONLY if (!e_comp_x_init()) return EINA_FALSE; #endif -#ifdef HAVE_WAYLAND_CLIENTS - e_comp_wl_init(); +#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) + if (!e_comp_wl_init()) return EINA_FALSE; #endif E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON, _e_comp_screensaver_on, NULL);