cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=173de925ed9bb3c1e219cf02a69d5724947ab727
commit 173de925ed9bb3c1e219cf02a69d5724947ab727 Author: Cedric Bail <[email protected]> Date: Fri Oct 27 16:37:58 2017 -0700 elementary, ecore: move efl_exit helper to Ecore. --- src/lib/ecore/Ecore_Eo.h | 12 ++++++++++++ src/lib/ecore/ecore_main.c | 10 ++++++++++ src/lib/elementary/elm_general.h | 12 ------------ src/lib/elementary/elm_main.c | 10 ---------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/lib/ecore/Ecore_Eo.h b/src/lib/ecore/Ecore_Eo.h index f9b1428180..05de244d43 100644 --- a/src/lib/ecore/Ecore_Eo.h +++ b/src/lib/ecore/Ecore_Eo.h @@ -38,6 +38,18 @@ extern "C" { #include "efl_loop.eo.h" +/** + * @brief Quits the main loop once all the events currently on the queue have + * been processed. + * + * @param[in] exit_code Returned value by begin() + * + * @note This function can only be called from the main loop. + * + * @ingroup Efl_Loop + */ +EAPI void efl_exit(int exit_code); + EAPI int efl_loop_exit_code_process(Eina_Value *value); #include "efl_loop_user.eo.h" diff --git a/src/lib/ecore/ecore_main.c b/src/lib/ecore/ecore_main.c index 932744ba9e..4b7c93d79c 100644 --- a/src/lib/ecore/ecore_main.c +++ b/src/lib/ecore/ecore_main.c @@ -2867,6 +2867,16 @@ _efl_loop_quit(Eo *obj EINA_UNUSED, Efl_Loop_Data *pd EINA_UNUSED, Eina_Value ex _ecore_exit_code = exit_code; } +EAPI void +efl_exit(int exit_code) +{ + Eina_Value v = EINA_VALUE_EMPTY; + + eina_value_setup(&v, EINA_VALUE_TYPE_INT); + eina_value_set(&v, &exit_code); + efl_loop_quit(ecore_main_loop_get(), v); +} + EOLIAN static Efl_Object * _efl_loop_efl_object_provider_find(Eo *obj, Efl_Loop_Data *pd, const Efl_Object *klass) { diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h index 3367a96f3b..4e3097eac1 100644 --- a/src/lib/elementary/elm_general.h +++ b/src/lib/elementary/elm_general.h @@ -164,18 +164,6 @@ extern EAPI double _elm_startup_time; return real__; \ } -/** - * @brief Quits the main loop once all the events currently on the queue have - * been processed. - * - * @param[in] exit_code Returned value by begin() - * - * @note This function can only be called from the main loop. - * - * @ingroup Efl_Loop - */ -EAPI void efl_exit(int exit_code); - #endif /* EFL_BETA_API_SUPPORT */ diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c index ddcddd9179..faf2ecaee1 100644 --- a/src/lib/elementary/elm_main.c +++ b/src/lib/elementary/elm_main.c @@ -1355,16 +1355,6 @@ _on_terminate(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED) } EAPI void -efl_exit(int exit_code) -{ - Eina_Value v = EINA_VALUE_EMPTY; - - eina_value_setup(&v, EINA_VALUE_TYPE_INT); - eina_value_set(&v, &exit_code); - efl_loop_quit(ecore_main_loop_get(), v); -} - -EAPI void elm_exit(void) { efl_exit(0); --
