[gnome-session] main: Better error message on not-found session

[Colin Walters <walters src gnome org>]

commit cba6e372e3f9130b22d7d614d376c3c9ae898ce7
Author: Colin Walters <walters verbum org>
Date:   Tue Feb 22 15:23:14 2011 -0500

    main: Better error message on not-found session
    
    I didn't have "gnome-fallback" yet in my install, but my user
    had that configured.  Just show a better error message for
    debugging.

 gnome-session/gsm-session-fill.c |    3 ---
 gnome-session/main.c             |    5 ++++-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gnome-session/gsm-session-fill.c b/gnome-session/gsm-session-fill.c
index 106e2f5..fd16ee3 100644
--- a/gnome-session/gsm-session-fill.c
+++ b/gnome-session/gsm-session-fill.c
@@ -432,9 +432,6 @@ gsm_session_fill (GsmManager  *manager,
                 return TRUE;
         }
 
-        if (IS_STRING_EMPTY (session))
-                session = _gsm_manager_get_default_session (manager);
-
         keyfile = get_session_keyfile (session, &actual_session, &is_fallback);
 
         if (!keyfile)
diff --git a/gnome-session/main.c b/gnome-session/main.c
index 1c17120..5e37a0d 100644
--- a/gnome-session/main.c
+++ b/gnome-session/main.c
@@ -350,10 +350,13 @@ main (int argc, char **argv)
         gdm_signal_handler_add (signal_handler, SIGINT, signal_cb, manager);
         gdm_signal_handler_set_fatal_func (signal_handler, shutdown_cb, manager);
 
+        if (IS_STRING_EMPTY (session_name))
+                session_name = _gsm_manager_get_default_session (manager);
+
         if (!gsm_session_fill (manager,
                                override_autostart_dirs,
                                session_name)) {
-                gsm_util_init_error (TRUE, "%s", "No valid session found.");
+                gsm_util_init_error (TRUE, "Failed to load session \"%s\"", session_name ? session_name : "(null)");
         }
 
         gsm_xsmp_server_start (xsmp_server);