NorwayFun
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

load wl_desktop_shell and xwayland after wl comp load

This commit is contained in:
Mike Blumenkrantz 2015-04-28 13:38:26 -04:00
parent ca7087b443
commit dbce320216
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/bin/e_comp_wl.c
View File

@ -70,24 +70,31 @@ static Eina_Bool
_e_comp_wl_cb_module_idle(void *data EINA_UNUSED) _e_comp_wl_cb_module_idle(void *data EINA_UNUSED)
{ {
E_Module *mod = NULL; E_Module *mod = NULL;
const char **m, *mods[] =
{
"wl_desktop_shell",
"xwayland",
NULL
};
/* check if we are still loading modules */ /* check if we are still loading modules */
if (e_module_loading_get()) return ECORE_CALLBACK_RENEW; if (e_module_loading_get()) return ECORE_CALLBACK_RENEW;
if (!(mod = e_module_find("wl_desktop_shell"))) for (m = mods; *m; m++)
mod = e_module_new("wl_desktop_shell");
if (mod)
{ {
e_module_enable(mod); E_Module *mod = e_module_find(*m);
/* FIXME: NB: if (!mod)
* Do we need to dispatch pending wl events here ?? */ mod = e_module_new(*m);
return ECORE_CALLBACK_CANCEL; if (mod)
e_module_enable(mod);
} }
return ECORE_CALLBACK_RENEW; /* FIXME: NB:
* Do we need to dispatch pending wl events here ?? */
return ECORE_CALLBACK_CANCEL;
} }
static void static void