diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-01-07 00:21:09 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-01-07 00:21:09 +0000 |
| commit | 17c963105901aa1c0908bddd9bab83969918cb9b (patch) | |
| tree | 331a2b80c2a4f4e535f3eb63013af700d7f369f5 /daemon | |
| parent | 852427bff50ff30922b1fa201d7a922e960a8b7f (diff) | |
| download | gdm-17c963105901aa1c0908bddd9bab83969918cb9b.tar.gz | |
Make error message more clear when session file is invalid. Now it says
2006-01-04 Brian Cameron <brian.cameron@sun.com>
* daemon/slave.c: Make error message more clear when session file
is invalid. Now it says what session file had the problem.
This fixes bug #322699.
* gui/gdmconfig.c: Now the gdm_config_get_xserver_details
function is more robust, and handles NULL return values
better and supports PRIORITY.
* gui/gdmsetup.c: Now that gdmconfig reads in the priority value,
gdmsetup will write it back out if that server is modified.
However, gdmsetup still doesn't allow you to modify the
priority value. Probably should add a spinbutton to the
dialog.
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/slave.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/daemon/slave.c b/daemon/slave.c index cc3074de..d9b789df 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -3522,21 +3522,24 @@ session_child_run (struct passwd *pwent, if (strcmp (session, GDM_SESSION_FAILSAFE_XTERM) != 0 && strcmp (session, GDM_SESSION_FAILSAFE_GNOME) != 0) { exec = gdm_get_session_exec (session, - FALSE /* check_try_exec */); + FALSE /* check_try_exec */); + if G_UNLIKELY (exec == NULL) { - gdm_error (_("%s: No Exec line in the session file: %s. Starting failsafe GNOME"), - "session_child_run", - session); + gchar *msg = g_strdup_printf ( + _("No Exec line in the session file: %s. Running the GNOME failsafe session instead"), + session); + + gdm_error (_("%s: %s"), "session_child_run", msg); + gdm_error_box (d, GTK_MESSAGE_ERROR, msg); + g_free (msg); + session = GDM_SESSION_FAILSAFE_GNOME; - gdm_error_box - (d, GTK_MESSAGE_ERROR, - _("The session you selected does not look valid. Running the GNOME failsafe session instead.")); } else { /* HACK!, if failsafe, we really wish to run the internal one */ if (strcmp (exec, "failsafe") == 0) { session = GDM_SESSION_FAILSAFE_XTERM; - exec = NULL; + exec = NULL; } } } |