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

reverse order of shell binding in wl_desktop_shell module 

Small patch to reverse order of shell binding so that we always
support the newest shell first and fallback to older ones.

Signed-off-by: Chris Michael <cp.michael@samsung.com>
This commit is contained in:
Chris Michael 2017-02-28 11:26:04 -05:00
parent 3b3e2e9897
commit 9b457513e4
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/modules/wl_desktop_shell/e_mod_main.c
View File

@ -161,18 +161,19 @@ e_modapi_init(E_Module *m)
{
Eina_Bool have_shell;
/* try to create global shell interface */
if (!wl_global_create(e_comp_wl->wl.disp, &wl_shell_interface, 1,
NULL, wl_shell_cb_bind))
have_shell = e_xdg_shell_v6_init();
have_shell &= e_xdg_shell_v5_init();
if (!have_shell)
{
ERR("Could not create shell global");
return NULL;
/* try to create global shell interface */
if (!wl_global_create(e_comp_wl->wl.disp, &wl_shell_interface, 1,
NULL, wl_shell_cb_bind))
{
ERR("Could not create shell global");
return NULL;
}
}
have_shell = e_xdg_shell_v5_init();
have_shell &= e_xdg_shell_v6_init();
if (!have_shell) return NULL;
#ifdef HAVE_WL_TEXT_INPUT
if (!e_input_panel_init())
{