forked from enlightenment/enlightenment
@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:
parent
b18b67ee92
commit
4bb1d8f390
|
@ -1115,8 +1115,7 @@ e_comp_init(void)
|
||||||
actions = eina_list_append(actions, act);
|
actions = eina_list_append(actions, act);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_WAYLAND_ONLY
|
||||||
#ifdef HAVE_WAYLAND_CLIENTS
|
|
||||||
{
|
{
|
||||||
const char *eng;
|
const char *eng;
|
||||||
|
|
||||||
|
@ -1131,11 +1130,12 @@ e_comp_init(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef HAVE_WAYLAND_ONLY
|
#ifndef HAVE_WAYLAND_ONLY
|
||||||
if (!e_comp_x_init()) return EINA_FALSE;
|
if (!e_comp_x_init()) return EINA_FALSE;
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_WAYLAND_CLIENTS
|
#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY)
|
||||||
e_comp_wl_init();
|
if (!e_comp_wl_init()) return EINA_FALSE;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON, _e_comp_screensaver_on, NULL);
|
E_LIST_HANDLER_APPEND(handlers, E_EVENT_SCREENSAVER_ON, _e_comp_screensaver_on, NULL);
|
||||||
|
|
Loading…
Reference in New Issue