[gnome-session] [gsm] Load default apps after saved and autostart apps

[Vincent Untz <vuntz src gnome org>]

commit 9b405c1516d41839383ae19cbef288eb4c22e3a8
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Jun 24 23:41:32 2009 +0200

    [gsm] Load default apps after saved and autostart apps
    
    Since we let the required components be overloaded by saved apps and
    autostart apps (mainly to respect Provides), it just makes sense to do
    the same for default apps.

 gnome-session/main.c |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/gnome-session/main.c b/gnome-session/main.c
index 0c55e5c..87d46ae 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -291,21 +291,18 @@ load_standard_apps (GsmManager *manager,
 
         autostart_dirs = gsm_util_get_autostart_dirs ();
 
-        append_default_apps (manager, default_session_key, autostart_dirs);
-
-        if (failsafe) {
-                goto out;
-        }
+        if (!failsafe) {
+                maybe_load_saved_session_apps (manager);
 
-        maybe_load_saved_session_apps (manager);
-
-        for (i = 0; autostart_dirs[i]; i++) {
-                gsm_manager_add_autostart_apps_from_dir (manager, autostart_dirs[i]);
+                for (i = 0; autostart_dirs[i]; i++) {
+                        gsm_manager_add_autostart_apps_from_dir (manager,
+                                                                 autostart_dirs[i]);
+                }
         }
 
- out:
         /* We do this at the end in case a saved session contains an
          * application that already provides one of the components. */
+        append_default_apps (manager, default_session_key, autostart_dirs);
         append_required_apps (manager);
 
         g_strfreev (autostart_dirs);