devilhorns pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9b457513e46dc6b01929dcd390a2b460ee6c2eb3
commit 9b457513e46dc6b01929dcd390a2b460ee6c2eb3 Author: Chris Michael <[email protected]> Date: Tue Feb 28 11:26:04 2017 -0500 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 <[email protected]> --- src/modules/wl_desktop_shell/e_mod_main.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/modules/wl_desktop_shell/e_mod_main.c b/src/modules/wl_desktop_shell/e_mod_main.c index 3775baa..ec87ae5 100644 --- a/src/modules/wl_desktop_shell/e_mod_main.c +++ b/src/modules/wl_desktop_shell/e_mod_main.c @@ -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()) { --
