discomfitor pushed a commit to branch master.

commit 5a90516141934437e1450ac362006af1e0681220
Author: Mike Blumenkrantz <[email protected]>
Date:   Mon Apr 29 09:45:36 2013 +0100

    move dnd init again so it doesn't break during comp init
---
 src/bin/e_main.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index dd22da1..a3c923d 100644
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -816,17 +816,6 @@ 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())
@@ -1697,7 +1686,18 @@ _e_main_screens_init(void)
         _e_main_shutdown(-1);
      }
    TS("E_Xkb Init 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);
+
    TS("\tscreens: manage roots");
    for (i = 0; i < num; i++)
      {

-- 

------------------------------------------------------------------------------
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

Reply via email to