Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_main.c
Log Message:
Move efreet_init to be sooner in the start process. If not we get a lot of
nasty hash == NULL warnings when trying todo dirs_init.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -3 -r1.237 -r1.238
--- e_main.c 13 Oct 2007 11:28:54 -0000 1.237
+++ e_main.c 16 Oct 2007 03:22:38 -0000 1.238
@@ -303,7 +303,6 @@
ecore_file_unlink(buf);
}
-
TS("ecore init");
/* basic ecore init */
if (!ecore_init())
@@ -455,7 +454,24 @@
TS("test done");
/*** Finished loading subsystems, Loading WM Specifics ***/
-
+ TS("efreet");
+ /* init FDO desktop */
+ if (!efreet_init())
+ {
+ e_error_message_show(_("Enlightenment cannot initialize the FDO
desktop system.\n"
+ "Perhaps you are out of memory?"));
+ _e_main_shutdown(-1);
+ }
+ _e_main_shutdown_push(efreet_shutdown);
+ if (!efreet_util_init())
+ {
+ e_error_message_show(_("Enlightenment cannot initialize the FDO
desktop system.\n"
+ "Perhaps you are out of memory?"));
+ _e_main_shutdown(-1);
+ }
+ _e_main_shutdown_push(efreet_util_shutdown);
+ TS("efreet done");
+
TS("dirs");
/* setup directories we will be using for configurations storage etc. */
if (!_e_main_dirs_init())
@@ -465,6 +481,7 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(_e_main_dirs_shutdown);
+
TS("filereg");
/* setup file registry */
if (!e_filereg_init())
@@ -473,6 +490,7 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_filereg_shutdown);
+
TS("config");
/* init config system */
if (!e_config_init())
@@ -481,6 +499,7 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_config_shutdown);
+
TS("path");
/* setup paths for finding things */
if (!_e_main_path_init())
@@ -490,6 +509,7 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(_e_main_path_shutdown);
+
TS("ipc");
/* setup e ipc service */
if (e_ipc_init())
@@ -595,24 +615,6 @@
_e_main_shutdown(-1);
}
_e_main_shutdown_push(e_intl_post_shutdown);
- TS("efreet");
- e_init_status_set(_("Starting Efreet"));
- /* init FDO desktop */
- if (!efreet_init())
- {
- e_error_message_show(_("Enlightenment cannot initialize the FDO
desktop system.\n"
- "Perhaps you are out of memory?"));
- _e_main_shutdown(-1);
- }
- _e_main_shutdown_push(efreet_shutdown);
- if (!efreet_util_init())
- {
- e_error_message_show(_("Enlightenment cannot initialize the FDO
desktop system.\n"
- "Perhaps you are out of memory?"));
- _e_main_shutdown(-1);
- }
- _e_main_shutdown_push(efreet_util_shutdown);
- TS("efreet done");
e_init_status_set(_("Setting up Paths"));
TS("efreet paths");
@@ -1056,6 +1058,7 @@
}
}
}
+
snprintf(buf, sizeof(buf), "%s/applications", efreet_data_home_get());
if (!ecore_file_mkpath(buf))
{
@@ -1153,9 +1156,7 @@
man = e_manager_new(roots[i], i);
if (man)
- {
- e_manager_show(man);
- }
+ e_manager_show(man);
else
{
e_error_message_show("Cannot create manager object for screen
%i\n",
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
