diff options
| author | Colin Walters <walters@verbum.org> | 2011-02-22 15:23:14 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2011-02-24 14:55:26 -0500 |
| commit | cba6e372e3f9130b22d7d614d376c3c9ae898ce7 (patch) | |
| tree | 32589c82f8ffd91b81db9f61de5fccd115faed3d | |
| parent | a4d8da2de02b3815441f8bdc9281dccdeba3c2dc (diff) | |
| download | gnome-session-cba6e372e3f9130b22d7d614d376c3c9ae898ce7.tar.gz | |
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.
| -rw-r--r-- | gnome-session/gsm-session-fill.c | 3 | ||||
| -rw-r--r-- | 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 106e2f50..fd16ee36 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 1c171204..5e37a0de 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); |