devilhorns pushed a commit to branch devs/devilhorns/wayland.
commit a11f24794e49393c527dfa3f95e93eab6cc4625b
Author: Chris Michael <[email protected]>
Date: Thu Mar 7 14:35:49 2013 +0000
Disable wl_shell module on shutdown.
In our init job (for wl_shell module loading), if we are still in the
process of loading modules, then we will wait.
Signed-off-by: Chris Michael <[email protected]>
---
src/bin/e_comp_wl.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 031ac53..200db1e 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -153,8 +153,14 @@ err:
void
e_comp_wl_shutdown(void)
{
+ E_Module *mod = NULL;
+
LOGFN(__FILE__, __LINE__, __FUNCTION__);
+ /* disable wl_shell module */
+ if ((mod = e_module_find("wl_shell")))
+ e_module_disable(mod);
+
if (_e_wl_comp->fd_handler)
ecore_main_fd_handler_del(_e_wl_comp->fd_handler);
@@ -566,6 +572,11 @@ _e_comp_wl_cb_init_job(void *data)
{
E_Module *mod = NULL;
+ /* if we are still in the process of loading modules, get out */
+ if (e_module_loading_get()) return;
+
+ /* all modules have been loaded now.
+ * try to find the wl_shell module, and enable it if not there */
if (!(mod = e_module_find("wl_shell")))
{
if ((mod = e_module_new("wl_shell")))
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
