always run deskenv init on startup, even during restart; gnome-settings-daemon is...

ticket #1939

SVN revision: 80415

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index b5b30f0..3ccb196 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -964,19 +964,16 @@ main(int argc, char **argv)
    TS("E_Update Init Done");
    _e_main_shutdown_push(e_update_shutdown);
 
-   if (!after_restart)
+   if (e_config->show_splash)
+     e_init_status_set(_("Setup Desktop Environment"));
+   TS("E_Deskenv Init");
+   if (!e_deskenv_init())
      {
-        if (e_config->show_splash)
-          e_init_status_set(_("Setup Desktop Environment"));
-        TS("E_Deskenv Init");
-        if (!e_deskenv_init())
-          {
-             e_error_message_show(_("Enlightenment cannot initialize its desktop environment.\n"));
-             _e_main_shutdown(-1);
-          }
-        TS("E_Deskenv Init Done");
-        _e_main_shutdown_push(e_deskenv_shutdown);
+        e_error_message_show(_("Enlightenment cannot initialize its desktop environment.\n"));
+        _e_main_shutdown(-1);
      }
+   TS("E_Deskenv Init Done");
+   _e_main_shutdown_push(e_deskenv_shutdown);
 
    if (e_config->show_splash)
      e_init_status_set(_("Setup File Ordering"));