shortcut manager and session manager

[Jasper Huijsmans]

Jasper Huijsmans schreef:
...
> Having the SESSION_MANAGER variable available in the mcs manager (and 
> its child processes) doesn't harm anything, does it? Would you object to 
> a patch to move setting of the variable before running mcs manager?
> 

The following patch seems to work for me. It moves the sm_init() call to 
the init_display() function. Does that look like a workable solution to 
you, or did I miss anything?

	Jasper

Index: main.c
===================================================================
--- main.c	(revision 19139)
+++ main.c	(working copy)
@@ -127,7 +127,8 @@

  static void
  init_display (GdkDisplay *dpy,
-              XfceRc     *rc)
+              XfceRc     *rc,
+              gboolean disable_tcp)
  {
    const gchar *engine;
    gint n;
@@ -135,11 +136,14 @@
    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 @@
    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 @@
    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);