tasn pushed a commit to branch master.
commit 65a09abb94728e08eceaf08faf4146e1d35724e7
Author: Tom Hacohen <[email protected]>
Date: Mon Apr 29 17:25:11 2013 +0100
Really run elm_shutdown in the ELM_MAIN macro.
Previous commit failed to actually do it.
---
src/bin/test.c | 1 -
src/lib/elm_general.h | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/bin/test.c b/src/bin/test.c
index c0ab461..b404f61 100644
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -829,7 +829,6 @@ 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 90b790b..ee6231a 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); 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); elm_shutdown(); 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
--
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
