Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_main.c
Log Message:
Move edit init after ecore init.
Enable shutdown. If there are problems, they should be solved not hidden!
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -3 -r1.205 -r1.206
--- e_main.c 24 Mar 2007 15:22:19 -0000 1.205
+++ e_main.c 24 Mar 2007 16:58:25 -0000 1.206
@@ -307,11 +307,6 @@
TS("edje init");
- /* init edje and set it up in frozen mode */
- edje_init();
- _e_main_shutdown_push(edje_shutdown);
- edje_freeze();
-
TS("ecore init");
/* basic ecore init */
if (!ecore_init())
@@ -321,6 +316,11 @@
exit(-1);
}
_e_main_shutdown_push(ecore_shutdown);
+
+ /* init edje and set it up in frozen mode */
+ edje_init();
+ edje_freeze();
+ _e_main_shutdown_push(edje_shutdown);
_e_cacheburst++;
/* eet_cacheburst(_e_cacheburst); */
@@ -833,7 +833,7 @@
e_error_message_show(_("Enlightenment cannot set up its desk locking
system."));
_e_main_shutdown(-1);
}
-/* _e_main_shutdown_push(e_desklock_shutdown); */
+ _e_main_shutdown_push(e_desklock_shutdown);
TS("add idle enterers");
/* add in a handler that just before we go idle we flush x */
@@ -887,13 +887,11 @@
/* Store current selected desktops */
_e_main_desk_save();
-#if 0 /* disabled due to segv's on shutdown/restart - not everyone will see
them */
/* unroll our stack of shutdown functions with exit code of 0 */
_e_main_shutdown(0);
e_intl_shutdown();
-#endif
-
+
/* if we were flagged to restart, then restart. */
if (restart)
{
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
