elm: Properly unregister providers on shutdown
authorJean-Philippe Andre <jp.andre@samsung.com>
Tue, 26 Sep 2017 05:09:14 +0000 (14:09 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Tue, 26 Sep 2017 08:58:07 +0000 (17:58 +0900)
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
src/lib/elementary/elm_config.c

index 4716ea6..e2a2b03 100644 (file)
@@ -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;
 
index f7a43e2..6c8d53b 100644 (file)
@@ -4352,8 +4352,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);