discomfitor pushed a commit to branch devs/discomfitor/comp-border.
commit ba2e68e2f5da377b6eedc7b28d5920edf6d26a4a
Author: Mike Blumenkrantz <[email protected]>
Date: Fri Mar 8 08:56:02 2013 +0000
move e_dnd init before efm init to prevent shutdown crash
---
src/bin/e_main.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 4cc6a51..2df3d96 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -814,6 +814,17 @@ main(int argc, char **argv)
TS("E_Container Freeze Done");
if (e_config->show_splash)
+ e_init_status_set(_("Setup DND"));
+ TS("E_Dnd Init");
+ if (!e_dnd_init())
+ {
+ e_error_message_show(_("Enlightenment cannot set up its dnd
system.\n"));
+ _e_main_shutdown(-1);
+ }
+ TS("E_Dnd Init Done");
+ _e_main_shutdown_push(e_dnd_shutdown);
+
+ if (e_config->show_splash)
e_init_status_set(_("Setup Filemanager"));
TS("E_Fm2 Init");
if (!e_fm2_init())
@@ -836,17 +847,6 @@ main(int argc, char **argv)
_e_main_shutdown_push(e_msg_shutdown);
if (e_config->show_splash)
- e_init_status_set(_("Setup DND"));
- TS("E_Dnd Init");
- if (!e_dnd_init())
- {
- e_error_message_show(_("Enlightenment cannot set up its dnd
system.\n"));
- _e_main_shutdown(-1);
- }
- TS("E_Dnd Init Done");
- _e_main_shutdown_push(e_dnd_shutdown);
-
- if (e_config->show_splash)
e_init_status_set(_("Setup Grab Input Handling"));
TS("E_Grabinput Init");
if (!e_grabinput_init())
--
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
