eo: use efl_provider_{un,}register infrastructure instead of Efl_Loop one.

Reviewed-by: Marcel Hollerbach <mail@marcel-hollerbach.de>
Differential Revision: https://phab.enlightenment.org/D9296

diff --git a/src/lib/ecore/ecore_events.c b/src/lib/ecore/ecore_events.c
index 921a9e9..83b4cef 100644 (file)
--- a/src/lib/ecore/ecore_events.c
+++ b/src/lib/ecore/ecore_events.c
@@ -235,7 +235,7 @@ _ecore_event_init(void)
    if ((!choice) || (!choice[0])) choice = "chained_mempool";
 
    _event_msg_handler = efl_add(ECORE_EVENT_MESSAGE_HANDLER_CLASS, _mainloop_singleton);
-   efl_loop_register(_mainloop_singleton, ECORE_EVENT_MESSAGE_HANDLER_CLASS, _event_msg_handler);
+   efl_provider_register(_mainloop_singleton, ECORE_EVENT_MESSAGE_HANDLER_CLASS, _event_msg_handler);
 
    if (!_event_msg_handler)
      {

diff --git a/src/lib/ecore/efl_loop.c b/src/lib/ecore/efl_loop.c
index a21aeea..b8a910c 100644 (file)
--- a/src/lib/ecore/efl_loop.c
+++ b/src/lib/ecore/efl_loop.c
@@ -276,7 +276,7 @@ _efl_loop_efl_object_constructor(Eo *obj, Efl_Loop_Data *pd)
    pd->epoll_fd = -1;
    pd->timer_fd = -1;
    pd->future_message_handler = efl_add(EFL_LOOP_MESSAGE_FUTURE_HANDLER_CLASS, obj);
-   efl_loop_register(obj, EFL_LOOP_MESSAGE_FUTURE_HANDLER_CLASS, pd->future_message_handler);
+   efl_provider_register(obj, EFL_LOOP_MESSAGE_FUTURE_HANDLER_CLASS, pd->future_message_handler);
 
    return obj;
 }

diff --git a/src/lib/edje/edje_main.c b/src/lib/edje/edje_main.c
index e920804..7838e9a 100644 (file)
--- a/src/lib/edje/edje_main.c
+++ b/src/lib/edje/edje_main.c
@@ -84,9 +84,9 @@ edje_init(void)
    _edje_scale = FROM_DOUBLE(1.0);
    _edje_global_obj = efl_add(EDJE_GLOBAL_CLASS, efl_main_loop_get());
    EINA_SAFETY_ON_TRUE_GOTO(!_edje_global_obj, shutdown_efreet);
-   EINA_SAFETY_ON_TRUE_GOTO(!efl_loop_register(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_MIXIN, _edje_global_obj), shutdown_efreet);
-   EINA_SAFETY_ON_TRUE_GOTO(!efl_loop_register(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj), shutdown_efreet);
-   EINA_SAFETY_ON_TRUE_GOTO(!efl_loop_register(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj), shutdown_efreet);
+   EINA_SAFETY_ON_TRUE_GOTO(!efl_provider_register(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_MIXIN, _edje_global_obj), shutdown_efreet);
+   EINA_SAFETY_ON_TRUE_GOTO(!efl_provider_register(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj), shutdown_efreet);
+   EINA_SAFETY_ON_TRUE_GOTO(!efl_provider_register(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj), shutdown_efreet);
 
    _edje_edd_init();
    _edje_text_init();
@@ -154,9 +154,9 @@ shutdown_all:
    _edje_edd_shutdown();
    if (_edje_global_obj)
      {
-        efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_MIXIN, _edje_global_obj);
-        efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
-        efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
+        efl_provider_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_MIXIN, _edje_global_obj);
+        efl_provider_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
+        efl_provider_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
         efl_del(_edje_global_obj);
         _edje_global_obj = NULL;
      }
@@ -213,9 +213,9 @@ _edje_shutdown_core(void)
    _edje_text_class_hash_free();
    _edje_size_class_hash_free();
    _edje_edd_shutdown();
-   efl_loop_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_MIXIN, _edje_global_obj);
-   efl_loop_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
-   efl_loop_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
+   efl_provider_unregister(efl_main_loop_get(), EFL_GFX_COLOR_CLASS_MIXIN, _edje_global_obj);
+   efl_provider_unregister(efl_main_loop_get(), EFL_GFX_TEXT_CLASS_INTERFACE, _edje_global_obj);
+   efl_provider_unregister(efl_main_loop_get(), EFL_GFX_SIZE_CLASS_INTERFACE, _edje_global_obj);
    efl_del(_edje_global_obj);
    _edje_global_obj = NULL;
 

diff --git a/src/lib/eio/eio_main.c b/src/lib/eio/eio_main.c
index d8722d3..ded7b8b 100644 (file)
--- a/src/lib/eio/eio_main.c
+++ b/src/lib/eio/eio_main.c
@@ -324,7 +324,7 @@ eio_init(void)
    */
 
    io_manager = efl_add(EFL_IO_MANAGER_CLASS, efl_main_loop_get());
-   efl_loop_register(efl_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager);
+   efl_provider_register(efl_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager);
 
    eina_log_timing(_eio_log_dom_global,
                    EINA_LOG_STATE_STOP,
@@ -362,7 +362,7 @@ eio_shutdown(void)
                    EINA_LOG_STATE_START,
                    EINA_LOG_STATE_SHUTDOWN);
 
-   efl_loop_unregister(efl_main_loop_get(), EFL_IO_MANAGER_CLASS, io_manager);
+   efl_provider_unregister(efl_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 6c6e31d..c11a16d 100644 (file)
--- a/src/lib/elementary/elm_config.c
+++ b/src/lib/elementary/elm_config.c
@@ -1814,8 +1814,8 @@ _config_load(void)
    if (_efl_config_obj)
      {
         efl_del_intercept_set(_efl_config_obj, NULL);
-        efl_loop_unregister(efl_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
-        efl_loop_unregister(efl_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj);
+        efl_provider_unregister(efl_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
+        efl_provider_unregister(efl_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_font_overlays_del_free();
@@ -1823,8 +1823,8 @@ _config_load(void)
         ELM_SAFE_FREE(_elm_key_bindings, eina_hash_free);
      }
    _efl_config_obj = efl_add(EFL_CONFIG_GLOBAL_CLASS, efl_main_loop_get());
-   efl_loop_register(efl_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
-   efl_loop_register(efl_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj);
+   efl_provider_register(efl_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
+   efl_provider_register(efl_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj);
    efl_del_intercept_set(_efl_config_obj, _efl_config_obj_del);
    if (!_use_build_config)
      {
@@ -5038,8 +5038,8 @@ void
 _elm_config_shutdown(void)
 {
    efl_del_intercept_set(_efl_config_obj, NULL);
-   efl_loop_unregister(efl_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
-   efl_loop_unregister(efl_main_loop_get(), EFL_CONFIG_GLOBAL_CLASS, _efl_config_obj);
+   efl_provider_unregister(efl_main_loop_get(), EFL_CONFIG_INTERFACE, _efl_config_obj);
+   efl_provider_unregister(efl_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);

diff --git a/src/tests/ecore/efl_app_test_loop.c b/src/tests/ecore/efl_app_test_loop.c
index 7b8dafc..6fa85a0 100644 (file)
--- a/src/tests/ecore/efl_app_test_loop.c
+++ b/src/tests/ecore/efl_app_test_loop.c
@@ -10,7 +10,7 @@
 #include "efl_app_suite.h"
 #include "../efl_check.h"
 
-EFL_START_TEST(efl_app_test_efl_loop_register)
+EFL_START_TEST(efl_app_test_efl_provider_register)
 {
    Efl_Object *t, *n;
 
@@ -25,13 +25,13 @@ EFL_START_TEST(efl_app_test_efl_loop_register)
 
    n = efl_add(EFL_LOOP_TIMER_CLASS, efl_app_main_get(),
                efl_loop_timer_interval_set(efl_added, 1.0));
-   efl_loop_register(efl_app_main_get(), EFL_LOOP_TIMER_CLASS, n);
+   efl_provider_register(efl_app_main_get(), EFL_LOOP_TIMER_CLASS, n);
 
    t = efl_provider_find(efl_app_main_get(), EFL_LOOP_TIMER_CLASS);
    fail_if(!efl_isa(t, EFL_LOOP_TIMER_CLASS));
    fail_if(t != n);
 
-   efl_loop_unregister(efl_app_main_get(), EFL_LOOP_TIMER_CLASS, n);
+   efl_provider_unregister(efl_app_main_get(), EFL_LOOP_TIMER_CLASS, n);
 
    t = efl_provider_find(efl_app_main_get(), EFL_LOOP_TIMER_CLASS);
    fail_if(t != NULL);
@@ -101,7 +101,7 @@ EFL_END_TEST
 
 void efl_app_test_efl_loop(TCase *tc)
 {
-   tcase_add_test(tc, efl_app_test_efl_loop_register);
+   tcase_add_test(tc, efl_app_test_efl_provider_register);
    tcase_add_test(tc, efl_app_test_efl_loop_concentric);
    tcase_add_test(tc, efl_loop_test_realized_name);
 }