Move sm_init() call before running mcs manager to have SESSION_MANAGER available.

(Old svn revision: 19274)

1 files changed, 7 insertions, 4 deletions

diff --git a/xfce4-session/main.c b/xfce4-session/main.c
index 24438bf6..52b74be8 100644
--- a/xfce4-session/main.c
+++ b/xfce4-session/main.c
@@ -127,7 +127,8 @@ usage (int exit_code)
 
 static void
 init_display (GdkDisplay *dpy,
-              XfceRc     *rc)
+              XfceRc     *rc,
+              gboolean disable_tcp)
 {
   const gchar *engine;
   gint n;
@@ -135,11 +136,14 @@ init_display (GdkDisplay *dpy,
   xfce_rc_set_group (rc, "Splash Screen");
   engine = xfce_rc_read_entry (rc, "Engine", NULL);
 
-  splash_screen = xfsm_splash_screen_new (dpy, engine);
+  splash_screen = xfsm_splash_screen_new (dpy, engine);  
   xfsm_splash_screen_next (splash_screen, _("Loading desktop settings"));
 
   gdk_flush ();
 
+  xfce_rc_set_group (rc, "General");
+  sm_init (rc, disable_tcp);
+  
   /* start a MCS manager process per screen (FIXME: parallel to loading logo) */
   for (n = 0; n < gdk_display_get_n_screens (dpy); ++n)
     {
@@ -190,7 +194,7 @@ initialize (int argc, char **argv)
   rc = xfsm_open_config (TRUE);
 
   dpy = gdk_display_get_default ();
-  init_display (dpy, rc);
+  init_display (dpy, rc, disable_tcp);
 
   /* verify that the DNS settings are ok */
   xfsm_splash_screen_next (splash_screen, _("Verifying DNS settings"));
@@ -203,7 +207,6 @@ initialize (int argc, char **argv)
   compat_kde = xfce_rc_read_bool_entry (rc, "LaunchKDE", FALSE);
 
   xfce_rc_set_group (rc, "General");
-  sm_init (rc, disable_tcp);
   xfsm_startup_init (rc);
   xfsm_manager_init (rc);