summaryrefslogtreecommitdiff
path: root/src/lib/ecore_ipc
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-09-26 16:32:29 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-26 17:58:07 +0900
commitf839905184ef084fad55f3deadd51b405768a49c (patch)
treeebd60b0fbeed22d9ea36f1994fb757cf8d135186 /src/lib/ecore_ipc
parent5cea60d1574ba689735c488bada4004b72f2d5e4 (diff)
ecore_ipc: Unregister log domain on shutdown
An old comment mentioned that this was explicitely not unregistered, but I believe the comment isn't valid since ecore_event_type_flush() was introduced.
Diffstat (limited to 'src/lib/ecore_ipc')
-rw-r--r--src/lib/ecore_ipc/ecore_ipc.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c
index 0b27496d2f..c0bd6ee1f0 100644
--- a/src/lib/ecore_ipc/ecore_ipc.c
+++ b/src/lib/ecore_ipc/ecore_ipc.c
@@ -309,19 +309,20 @@ ecore_ipc_init(void)
309 if (++_ecore_ipc_init_count != 1) 309 if (++_ecore_ipc_init_count != 1)
310 return _ecore_ipc_init_count; 310 return _ecore_ipc_init_count;
311 311
312 if (_ecore_ipc_log_dom < 0) 312 _ecore_ipc_log_dom = eina_log_domain_register
313 ("ecore_ipc", ECORE_IPC_DEFAULT_LOG_COLOR);
314 if(_ecore_ipc_log_dom < 0)
313 { 315 {
314 _ecore_ipc_log_dom = eina_log_domain_register 316 EINA_LOG_ERR("Impossible to create a log domain for the Ecore IPC module.");
315 ("ecore_ipc", ECORE_IPC_DEFAULT_LOG_COLOR); 317 return --_ecore_ipc_init_count;
316 if(_ecore_ipc_log_dom < 0)
317 {
318 EINA_LOG_ERR("Impossible to create a log domain for the Ecore IPC module.");
319 return --_ecore_ipc_init_count;
320 }
321 } 318 }
322 319
323 if (!ecore_con_init()) 320 if (!ecore_con_init())
324 return --_ecore_ipc_init_count; 321 {
322 eina_log_domain_unregister(_ecore_ipc_log_dom);
323 _ecore_ipc_log_dom = -1;
324 return --_ecore_ipc_init_count;
325 }
325 326
326 ECORE_IPC_EVENT_CLIENT_ADD = ecore_event_type_new(); 327 ECORE_IPC_EVENT_CLIENT_ADD = ecore_event_type_new();
327 ECORE_IPC_EVENT_CLIENT_DEL = ecore_event_type_new(); 328 ECORE_IPC_EVENT_CLIENT_DEL = ecore_event_type_new();
@@ -353,9 +354,8 @@ ecore_ipc_shutdown(void)
353 354
354 ecore_con_shutdown(); 355 ecore_con_shutdown();
355 356
356 /* do not unregister log domain as ecore_ipc_servers may be pending deletion 357 eina_log_domain_unregister(_ecore_ipc_log_dom);
357 * due Ecore_Event. 358 _ecore_ipc_log_dom = -1;
358 */
359 359
360 return _ecore_ipc_init_count; 360 return _ecore_ipc_init_count;
361} 361}