jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "reverse order of shell binding in wl_desktop_shell module" 

Reverting the shell order commit in favor of a better approach as
discussed on IRC.

This reverts commit 9b457513e4.
This commit is contained in:
Chris Michael 2017-02-28 11:36:23 -05:00
parent 9b457513e4
commit 96e63d863f
1 changed files with 9 additions and 10 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,19 +161,18 @@ e_modapi_init(E_Module *m)
{ {
Eina_Bool have_shell; Eina_Bool have_shell;
have_shell = e_xdg_shell_v6_init(); /* try to create global shell interface */
have_shell &= e_xdg_shell_v5_init(); if (!wl_global_create(e_comp_wl->wl.disp, &wl_shell_interface, 1,
if (!have_shell) NULL, wl_shell_cb_bind))
{ {
/* try to create global shell interface */ ERR("Could not create shell global");
if (!wl_global_create(e_comp_wl->wl.disp, &wl_shell_interface, 1, return NULL;
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 #ifdef HAVE_WL_TEXT_INPUT
if (!e_input_panel_init()) if (!e_input_panel_init())
{ {