diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-05-12 19:45:26 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-05-12 19:45:26 +0000 |
| commit | f144c54e9776c7b78dd56e34278489de91e335e8 (patch) | |
| tree | f515fff337262b5b03db50d83ed1ccb261cb30ed | |
| parent | 9a9f3e10b81dbf335114ba8b7e9323eaf083c9e5 (diff) | |
| download | gdm-f144c54e9776c7b78dd56e34278489de91e335e8.tar.gz | |
Fix bug that was causing the ShowGnomeFailsafeSession and
2006-05-12 Brian Cameron <brian.cameron@sun.com>
* gui/gdmsession.c: Fix bug that was causing the
ShowGnomeFailsafeSession and ShowGnomeXtermSession configuration
values not to work right.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | gui/gdmsession.c | 9 |
2 files changed, 8 insertions, 7 deletions
@@ -1,3 +1,9 @@ +2006-05-12 Brian Cameron <brian.cameron@sun.com> + + * gui/gdmsession.c: Fix bug that was causing the + ShowGnomeFailsafeSession and ShowGnomeXtermSession configuration + values not to work right. + 2006-05-12 Christian Kirbach <Christian.Kirbach@siemens.com> * daemon/gdm.c, gui/gdmXnestchosser.c, gui/gdmchooser.c, diff --git a/gui/gdmsession.c b/gui/gdmsession.c index 329dea0d..34c66cac 100644 --- a/gui/gdmsession.c +++ b/gui/gdmsession.c @@ -111,7 +111,6 @@ gdm_session_list_init () GdmSession *session = NULL; gboolean some_dir_exists = FALSE; gboolean searching_for_default = TRUE; - gboolean show_xterm_failsafe; struct dirent *dent; char **vec; char *name; @@ -275,7 +274,6 @@ gdm_session_list_init () gdm_common_error ("%s: Session directory <%s> not found!", "gdm_login_session_init", ve_sure_string (gdm_config_get_string (GDM_KEY_SESSION_DESKTOP_DIR))); - show_xterm_failsafe = TRUE; session_dir_whacked_out = TRUE; } @@ -284,14 +282,11 @@ gdm_session_list_init () ve_sure_string (gdm_config_get_string (GDM_KEY_SESSION_DESKTOP_DIR))); session_dir_whacked_out = TRUE; - show_xterm_failsafe = TRUE; default_session = g_strdup (GDM_SESSION_FAILSAFE_GNOME); } - if (gdm_config_get_bool (GDM_KEY_SHOW_XTERM_FAILSAFE)) - show_xterm_failsafe = TRUE; - if (show_xterm_failsafe) { + if (gdm_config_get_bool (GDM_KEY_SHOW_GNOME_FAILSAFE)) { session = g_new0 (GdmSession, 1); session->name = g_strdup (_("Failsafe _GNOME")); session->comment = g_strdup (_("This is a failsafe session that will log you " @@ -303,7 +298,7 @@ gdm_session_list_init () g_strdup (GDM_SESSION_FAILSAFE_GNOME), session); } - if (show_xterm_failsafe) { + if (gdm_config_get_bool (GDM_KEY_SHOW_XTERM_FAILSAFE)) { session = g_new0 (GdmSession, 1); session->name = g_strdup (_("Failsafe _Terminal")); session->comment = g_strdup (_("This is a failsafe session that will log you " |