raster pushed a commit to branch master.
commit d331257abee8894b9043a89f09163058a2260a0c
Author: Carsten Haitzler (Rasterman) <[email protected]>
Date: Tue Apr 30 12:21:12 2013 +0900
Revert "Really run elm_shutdown in the ELM_MAIN macro."
This reverts commit 65a09abb94728e08eceaf08faf4146e1d35724e7.
This does break abi. debate as to if this should hsve been done in the
macro or not is another matter.. but changing this does break
abi/behaviour.
---
src/bin/test.c | 1 +
src/lib/elm_general.h | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/test.c b/src/bin/test.c
index b404f61..c0ab461 100644
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -829,6 +829,7 @@ elm_main(int argc, char **argv)
EINA_LIST_FREE(tests, t)
free(t);
+ elm_shutdown(); /* clean up and shut down */
/* exit code */
return 0;
}
diff --git a/src/lib/elm_general.h b/src/lib/elm_general.h
index ee6231a..90b790b 100644
--- a/src/lib/elm_general.h
+++ b/src/lib/elm_general.h
@@ -120,7 +120,7 @@ typedef Eina_Bool (*Elm_Event_Cb)(void *data,
Evas_Object *obj, Evas
extern EAPI double _elm_startup_time;
#ifndef ELM_LIB_QUICKLAUNCH
-#define ELM_MAIN() int main(int argc, char **argv) { int ret;
_elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret =
elm_main(argc, argv); elm_shutdown(); return ret; } /**< macro to be used after
the elm_main() function */
+#define ELM_MAIN() int main(int argc, char **argv) { int ret;
_elm_startup_time = ecore_time_unix_get(); elm_init(argc, argv); ret =
elm_main(argc, argv); return ret; } /**< macro to be used after the elm_main()
function */
#else
#define ELM_MAIN() int main(int argc, char **argv) { _elm_startup_time =
ecore_time_unix_get(); return elm_quicklaunch_fallback(argc, argv); } /**<
macro to be used after the elm_main() function */
#endif
--
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
