[EGIT] [core/efl] efl-1.20 03/16: elm: Properly unregister providers on shutdown

[Jean-Philippe ANDRÉ]

jpeg pushed a commit to branch efl-1.20.

http://git.enlightenment.org/core/efl.git/commit/?id=f24a9903f8ef7f598979c4d1696c62d021fedada

commit f24a9903f8ef7f598979c4d1696c62d021fedada
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Tue Sep 26 14:09:14 2017 +0900

    elm: Properly unregister providers on shutdown
    
    This should fix some errors in make check with CK_FORK=no
    
    Test:
      <efl/build>/src$ CK_FORK=no ./tests/elementary/elm_suite elm_config
    
    @fix
---
 src/lib/eio/eio_main.c          | 1 +
 src/lib/elementary/elm_config.c | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib/eio/eio_main.c b/src/lib/eio/eio_main.c
index 4716ea63f4..e2a2b03925 100644
--- a/src/lib/eio/eio_main.c
+++ b/src/lib/eio/eio_main.c
@@ -358,6 +358,7 @@ eio_shutdown(void)
                    EINA_LOG_STATE_START,
                    EINA_LOG_STATE_SHUTDOWN);
 
+   efl_loop_unregister(ecore_main_loop_get(), EFL_IO_MANAGER_CLASS, 
io_manager);
    efl_del(io_manager);
    io_manager = NULL;
 
diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c
index f6bc5a8ee6..83715c563d 100644
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -4304,8 +4304,8 @@ void
 _elm_config_shutdown(void)
 {
    efl_del_intercept_set(_efl_config_obj, NULL);
-   efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_INTERFACE, NULL);
-   efl_loop_register(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, NULL);
+   efl_loop_unregister(ecore_main_loop_get(), EFL_CONFIG_INTERFACE, 
_efl_config_obj);
+   efl_loop_unregister(ecore_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, 
_efl_config_obj);
    ELM_SAFE_FREE(_efl_config_obj, efl_del);
    ELM_SAFE_FREE(_elm_config, _config_free);
    ELM_SAFE_FREE(_elm_preferred_engine, eina_stringshare_del);

--