summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-03-27 13:01:35 -0400
committerStefan Schmidt <stefan@osg.samsung.com>2018-04-05 11:10:26 +0200
commite9eb96e097cbdb048a4d3896a6bbabcb7e4684db (patch)
tree57ef844631b7d82d7b249393e4b81471a36c3155 /src/lib
parentff67706783d1cdc24a2a8d89eb2246a6b6368292 (diff)
eldbus: call ecore_init in eldbus_init
eldbus requires ecore and cannot run without it @fix Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/eldbus/eldbus_core.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/lib/eldbus/eldbus_core.c b/src/lib/eldbus/eldbus_core.c
index ba4a3ba..ffc5bc2 100644
--- a/src/lib/eldbus/eldbus_core.c
+++ b/src/lib/eldbus/eldbus_core.c
@@ -136,10 +136,18 @@ eldbus_init(void)
136 return 0; 136 return 0;
137 } 137 }
138 138
139 if (!ecore_init())
140 {
141 fputs("Eldbus: Unable to initialize ecore\n", stderr);
142 eina_shutdown();
143 return 0;
144 }
145
139 _eldbus_log_dom = eina_log_domain_register("eldbus", EINA_COLOR_BLUE); 146 _eldbus_log_dom = eina_log_domain_register("eldbus", EINA_COLOR_BLUE);
140 if (_eldbus_log_dom < 0) 147 if (_eldbus_log_dom < 0)
141 { 148 {
142 EINA_LOG_ERR("Unable to create an 'eldbus' log domain"); 149 EINA_LOG_ERR("Unable to create an 'eldbus' log domain");
150 ecore_shutdown();
143 eina_shutdown(); 151 eina_shutdown();
144 return 0; 152 return 0;
145 } 153 }
@@ -150,6 +158,7 @@ eldbus_init(void)
150 EINA_LOG_ERR("Unable to create an 'eldbus_model' log domain"); 158 EINA_LOG_ERR("Unable to create an 'eldbus_model' log domain");
151 eina_log_domain_unregister(_eldbus_log_dom); 159 eina_log_domain_unregister(_eldbus_log_dom);
152 _eldbus_log_dom = -1; 160 _eldbus_log_dom = -1;
161 ecore_shutdown();
153 eina_shutdown(); 162 eina_shutdown();
154 return 0; 163 return 0;
155 } 164 }
@@ -188,6 +197,7 @@ message_failed:
188 eldbus_model_log_dom = -1; 197 eldbus_model_log_dom = -1;
189 eina_log_domain_unregister(_eldbus_log_dom); 198 eina_log_domain_unregister(_eldbus_log_dom);
190 _eldbus_log_dom = -1; 199 _eldbus_log_dom = -1;
200 ecore_shutdown();
191 eina_shutdown(); 201 eina_shutdown();
192 202
193 return 0; 203 return 0;
@@ -291,6 +301,7 @@ eldbus_shutdown(void)
291 eldbus_model_log_dom = -1; 301 eldbus_model_log_dom = -1;
292 eina_log_domain_unregister(_eldbus_log_dom); 302 eina_log_domain_unregister(_eldbus_log_dom);
293 _eldbus_log_dom = -1; 303 _eldbus_log_dom = -1;
304 ecore_shutdown();
294 eina_shutdown(); 305 eina_shutdown();
295 306
296 return 0; 307 return 0;