From 15ddd174a1f30b26f5cc67ce983bcc6ce0567031 Mon Sep 17 00:00:00 2001 From: Jean Guyomarc'h Date: Fri, 4 Mar 2016 16:00:58 -0800 Subject: ecore: better resources use in the glib integration Summary: When glib support is enabled (HAVE_GLIB), _ecore_glib_init() was always reserving resources. However, its counterpart may not be called when: - glib is not always integrated and - when a user didn't explicitly required the integration. Calling _ecore_glib_init() within the request code will cause the resources to be reserved only when the integration with glib is required and furthermore guarantees that resources always have a chance to be released. Reviewers: cedric, raster Subscribers: cedric, jpeg Differential Revision: https://phab.enlightenment.org/D3749 Signed-off-by: Cedric BAIL --- src/lib/ecore/ecore.c | 1 - src/lib/ecore/ecore_glib.c | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c index 0a5b1d82ee..247612b4cf 100644 --- a/src/lib/ecore/ecore.c +++ b/src/lib/ecore/ecore.c @@ -248,7 +248,6 @@ ecore_init(void) _ecore_exe_init(); #endif _ecore_thread_init(); - _ecore_glib_init(); _ecore_job_init(); _ecore_time_init(); diff --git a/src/lib/ecore/ecore_glib.c b/src/lib/ecore/ecore_glib.c index e2586c1b27..7232d15ea5 100644 --- a/src/lib/ecore/ecore_glib.c +++ b/src/lib/ecore/ecore_glib.c @@ -275,6 +275,9 @@ ecore_main_loop_glib_integrate(void) _ecore_glib_select_original = func; ecore_main_loop_select_func_set(_ecore_glib_select); _ecore_glib_active = EINA_TRUE; + + /* Init only when requested */ + _ecore_glib_init(); return EINA_TRUE; #else ERR("No glib support"); -- cgit v1.2.1