summaryrefslogtreecommitdiff
path: root/src/lib/eldbus
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-04-12 14:11:32 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-04-12 14:11:32 +0900
commit53c66c98c2ae13a8c96b4ae1f9d735cda179e89d (patch)
treedb16f21850bf182ddbeb2949a923456414161997 /src/lib/eldbus
parentf54a2eb5703381f9e80604cdca84f91b72ae0090 (diff)
ecore - system modules - fix eldbus interdependency and complaints
so ecore uses ecore system modules ... that use eldbus. eldbus inits ecore. this is a vicious cycle. eldbus shouldnt init ecore. it's a dependency but should be provided outside of initting eldbus. this all led to hack-arounds on initting eldbus in these ecore modules that just break things like shutting down eldbus when still in use. this ensures any pending messages are canceled on ecore module shutdown. this ensures every ecore module fully inits and shuts down eldbus as they should so refcounting the inits works. this stops eldbus from inittign ecore to avoid the circuluar dependency. this stops lots of CRI/ERR complaints eg if you run elua with no cmdline options. this is just better. @fix
Diffstat (limited to 'src/lib/eldbus')
-rw-r--r--src/lib/eldbus/eldbus_core.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/lib/eldbus/eldbus_core.c b/src/lib/eldbus/eldbus_core.c
index 29899d1564..f5bfc4a447 100644
--- a/src/lib/eldbus/eldbus_core.c
+++ b/src/lib/eldbus/eldbus_core.c
@@ -115,15 +115,6 @@ eldbus_init(void)
115 return 0; 115 return 0;
116 } 116 }
117 117
118 if (!ecore_init())
119 {
120 ERR("Unable to initialize ecore");
121 eina_log_domain_unregister(_eldbus_log_dom);
122 _eldbus_log_dom = -1;
123 eina_shutdown();
124 return 0;
125 }
126
127 eina_magic_string_set(ELDBUS_CONNECTION_MAGIC, "Eldbus_Connection"); 118 eina_magic_string_set(ELDBUS_CONNECTION_MAGIC, "Eldbus_Connection");
128 eina_magic_string_set(ELDBUS_MESSAGE_MAGIC, "Eldbus_Message"); 119 eina_magic_string_set(ELDBUS_MESSAGE_MAGIC, "Eldbus_Message");
129 eina_magic_string_set(ELDBUS_SIGNAL_HANDLER_MAGIC, "Eldbus_Signal_Handler"); 120 eina_magic_string_set(ELDBUS_SIGNAL_HANDLER_MAGIC, "Eldbus_Signal_Handler");
@@ -154,7 +145,6 @@ pending_failed:
154signal_handler_failed: 145signal_handler_failed:
155 eldbus_message_shutdown(); 146 eldbus_message_shutdown();
156message_failed: 147message_failed:
157 ecore_shutdown();
158 eina_log_domain_unregister(eldbus_model_log_dom); 148 eina_log_domain_unregister(eldbus_model_log_dom);
159 eldbus_model_log_dom = -1; 149 eldbus_model_log_dom = -1;
160 eina_log_domain_unregister(_eldbus_log_dom); 150 eina_log_domain_unregister(_eldbus_log_dom);
@@ -257,7 +247,6 @@ eldbus_shutdown(void)
257 eldbus_signal_handler_shutdown(); 247 eldbus_signal_handler_shutdown();
258 eldbus_message_shutdown(); 248 eldbus_message_shutdown();
259 249
260 ecore_shutdown();
261 eina_log_domain_unregister(eldbus_model_log_dom); 250 eina_log_domain_unregister(eldbus_model_log_dom);
262 eldbus_model_log_dom = -1; 251 eldbus_model_log_dom = -1;
263 eina_log_domain_unregister(_eldbus_log_dom); 252 eina_log_domain_unregister(_eldbus_log_dom);