summaryrefslogtreecommitdiff
path: root/src/lib/ecore_con
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2018-04-09 16:57:25 -0700
committerCedric BAIL <cedric@osg.samsung.com>2018-05-01 10:39:01 -0700
commit67cbc0d8af0bc489f37533024a5422a0009245c7 (patch)
treec0aa5db8cff09ac249a2a2b9b279ac8e2ac14cef /src/lib/ecore_con
parent3e648c475f8ccaa09f08e656efb1b6860a477a1b (diff)
ecore_con: make the ecore_con log domain available during ecore_shutdown.
Diffstat (limited to 'src/lib/ecore_con')
-rw-r--r--src/lib/ecore_con/ecore_con.c19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/lib/ecore_con/ecore_con.c b/src/lib/ecore_con/ecore_con.c
index a396fa9ae8..0e6a896eb6 100644
--- a/src/lib/ecore_con/ecore_con.c
+++ b/src/lib/ecore_con/ecore_con.c
@@ -89,14 +89,17 @@ ecore_con_init(void)
89 return --_ecore_con_init_count; 89 return --_ecore_con_init_count;
90#endif 90#endif
91 91
92 if (!ecore_init()) 92 if (!eina_init())
93 goto ecore_err; 93 goto eina_err;
94 94
95 _ecore_con_log_dom = eina_log_domain_register 95 _ecore_con_log_dom = eina_log_domain_register
96 ("ecore_con", ECORE_CON_DEFAULT_LOG_COLOR); 96 ("ecore_con", ECORE_CON_DEFAULT_LOG_COLOR);
97 if (_ecore_con_log_dom < 0) 97 if (_ecore_con_log_dom < 0)
98 goto ecore_con_log_error; 98 goto ecore_con_log_error;
99 99
100 if (!ecore_init())
101 goto ecore_err;
102
100 _efl_net_proxy_helper_init(); 103 _efl_net_proxy_helper_init();
101 104
102 ecore_con_mempool_init(); 105 ecore_con_mempool_init();
@@ -125,7 +128,9 @@ ecore_con_log_error:
125 EINA_LOG_ERR("Failed to create a log domain for Ecore Con."); 128 EINA_LOG_ERR("Failed to create a log domain for Ecore Con.");
126 ecore_shutdown(); 129 ecore_shutdown();
127 130
128ecore_err: 131 ecore_err:
132 eina_shutdown();
133 eina_err:
129#ifdef _WIN32 134#ifdef _WIN32
130 evil_shutdown(); 135 evil_shutdown();
131#endif 136#endif
@@ -152,14 +157,16 @@ ecore_con_shutdown(void)
152 157
153 ecore_con_legacy_shutdown(); 158 ecore_con_legacy_shutdown();
154 159
155 eina_log_domain_unregister(_ecore_con_log_dom);
156 _ecore_con_log_dom = -1;
157
158 ecore_shutdown(); 160 ecore_shutdown();
159#ifdef _WIN32 161#ifdef _WIN32
160 evil_shutdown(); 162 evil_shutdown();
161#endif 163#endif
162 164
165 eina_log_domain_unregister(_ecore_con_log_dom);
166 _ecore_con_log_dom = -1;
167
168 eina_shutdown();
169
163 return _ecore_con_init_count; 170 return _ecore_con_init_count;
164} 171}
165 172