discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=dbce3202166fb4b7e26b6aeb18e1fb956514a3aa
commit dbce3202166fb4b7e26b6aeb18e1fb956514a3aa
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Tue Apr 28 13:38:26 2015 -0400
load wl_desktop_shell and xwayland after wl comp load
---
src/bin/e_comp_wl.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index b0c8dbd..6c0a4db 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -70,24 +70,31 @@ static Eina_Bool
_e_comp_wl_cb_module_idle(void *data EINA_UNUSED)
{
E_Module *mod = NULL;
+ const char **m, *mods[] =
+ {
+ "wl_desktop_shell",
+ "xwayland",
+ NULL
+ };
/* check if we are still loading modules */
if (e_module_loading_get()) return ECORE_CALLBACK_RENEW;
- if (!(mod = e_module_find("wl_desktop_shell")))
- mod = e_module_new("wl_desktop_shell");
-
- if (mod)
+ for (m = mods; *m; m++)
{
- e_module_enable(mod);
+ E_Module *mod = e_module_find(*m);
- /* FIXME: NB:
- * Do we need to dispatch pending wl events here ?? */
+ if (!mod)
+ 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
--
