enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

Try to init (and error check the init) of ecore_wl2 library before we 

create a compositor

ref T2919

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2015-12-07 09:25:49 -05:00
parent 1411222a7a
commit efa015f926
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/e_comp_wl.c
View File

@ -2457,8 +2457,6 @@ _e_comp_wl_compositor_create(void)
return EINA_FALSE;
}
ecore_wl2_init();
/* set compositor wayland data */
e_comp_wl = e_comp->wl_comp_data = cdata;
@ -2660,6 +2658,13 @@ _e_comp_wl_gl_init(void *d EINA_UNUSED)
E_API Eina_Bool
e_comp_wl_init(void)
{
/* try to init ecore_wayland */
if (!ecore_wl2_init())
{
e_error_message_show(_("Enlightenment cannot initialize Ecore_Wl2!\n"));
return EINA_FALSE;
}
/* set gl available if we have ecore_evas support */
if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_WAYLAND_EGL) ||
ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))
@ -2672,13 +2677,6 @@ e_comp_wl_init(void)
return EINA_FALSE;
}
/* try to init ecore_wayland */
if (!ecore_wl2_init())
{
e_error_message_show(_("Enlightenment cannot initialize Ecore_Wl2!\n"));
return EINA_FALSE;
}
/* create hash to store clients */
/* clients_win_hash = eina_hash_int64_new(NULL); */