aboutsummaryrefslogtreecommitdiffstats
path: root/legacy/ecore/src/lib/ecore/ecore.c
diff options
context:
space:
mode:
authorMike McCormack <mj.mccormack@samsung.com>2010-08-14 11:19:03 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-08-14 11:19:03 +0000
commit3bdbb34d643161c30ef7c50b1ee8cfac4f4e4cba (patch)
tree58c65c49594fa1097b20a25c253fa7982c3b003d /legacy/ecore/src/lib/ecore/ecore.c
parentFrom: Alexander Kerner <alexander.kerner@googlemail.com> (diff)
downloadefl-3bdbb34d643161c30ef7c50b1ee8cfac4f4e4cba.tar.gz
From: Mike McCormack <mj.mccormack@samsung.com>
This patch implements the ecore main loop in terms of the GTK main loop, so ecore is a layer on top of glib. Compared the the current glib integration in ecore, this has the added advantage of allowing use of EFL libraries in GTK. SVN revision: 51113
Diffstat (limited to 'legacy/ecore/src/lib/ecore/ecore.c')
-rw-r--r--legacy/ecore/src/lib/ecore/ecore.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/legacy/ecore/src/lib/ecore/ecore.c b/legacy/ecore/src/lib/ecore/ecore.c
index 9f654131b3..5bf12bc10d 100644
--- a/legacy/ecore/src/lib/ecore/ecore.c
+++ b/legacy/ecore/src/lib/ecore/ecore.c
@@ -111,13 +111,13 @@ ecore_init(void)
}
if (getenv("ECORE_FPS_DEBUG")) _ecore_fps_debug = 1;
if (_ecore_fps_debug) _ecore_fps_debug_init();
+ _ecore_main_loop_init();
_ecore_signal_init();
_ecore_exe_init();
_ecore_thread_init();
_ecore_glib_init();
_ecore_job_init();
_ecore_loop_time = ecore_time_get();
- _ecore_main_loop_init();
#if HAVE_MALLINFO
if (getenv("ECORE_MEM_STAT"))
@@ -127,7 +127,7 @@ ecore_init(void)
}
#endif
-#ifdef GLIB_INTEGRATION_ALWAYS
+#if defined(GLIB_INTEGRATION_ALWAYS)
if (_ecore_glib_always_integrate) ecore_main_loop_glib_integrate();
#endif
@@ -172,6 +172,7 @@ ecore_shutdown(void)
_ecore_event_shutdown();
_ecore_main_shutdown();
_ecore_signal_shutdown();
+ _ecore_main_loop_shutdown();
#if HAVE_MALLINFO
if (getenv("ECORE_MEM_STAT"))