@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 <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2014-03-17 13:52:12 +00:00
parent b18b67ee92
commit 4bb1d8f390
1 changed files with 4 additions and 4 deletions

View File

@ -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);