diff options
| author | Brian Cameron <Brian.Cameron@sun.com> | 2009-05-13 20:55:26 -0500 |
|---|---|---|
| committer | Brian Cameron <Brian.Cameron@sun.com> | 2009-05-13 20:55:26 -0500 |
| commit | 2f5914175a8a9eced569c619c09fe56e6166f1f5 (patch) | |
| tree | 8b0d7e57603ec301cfe224af6b387a75aa9a541e | |
| parent | d278a96e726e50958a293517e854f75a56cc5c2f (diff) | |
| download | gdm-2f5914175a8a9eced569c619c09fe56e6166f1f5.tar.gz | |
Fix the dialog that asks the user if they want to change their default session
when the one in the user's .dmrc file is not installed on the system.
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | gui/gdmlogin.c | 4 | ||||
| -rw-r--r-- | gui/greeter/greeter.c | 4 |
3 files changed, 18 insertions, 4 deletions
@@ -1,3 +1,17 @@ +2009-05-13 Brian Cameron <brian.cameron@sun.com> + + * gui/gdmlogin.c, gui/greeter/greeter.c: Fix the dialog that asks the + user if they want to change their default session when the one in the + user's .dmrc file is not installed on the system. + +2009-04-24 Brian Cameron <brian.cameron@sun.com> + + * configure.ac: Now configure favors the Xfree Xinerama interfaces over + the obsolete Solaris specific interfaces. This ensures that Xinerama + works on OpenSolaris where Xfree should be used, and also on Solaris + 10 where the Solaris specific interfaces should be used. Fixes bug + #580060. Also move DEFOPEN configure checks before Xinerama checks. + 2009-03-19 Brian Cameron <brian.cameron@sun.com> * Release 2.20.10: diff --git a/gui/gdmlogin.c b/gui/gdmlogin.c index 33d4227a..bd204c60 100644 --- a/gui/gdmlogin.c +++ b/gui/gdmlogin.c @@ -1500,10 +1500,10 @@ process_operation (guchar op_code, case SESSION_LOOKUP_PREFERRED_MISSING: firstmsg = g_strdup_printf (_("Do you wish to make %s the default for " "future sessions?"), - gdm_session_name (tmp)); + gdm_session_name (gdm_get_default_session ())); secondmsg = g_strdup_printf (_("Your preferred session type %s is not " "installed on this computer."), - gdm_session_name (gdm_get_default_session ())); + gdm_session_name (tmp)); save_session = gdm_wm_query_dialog (firstmsg, secondmsg, _("Make _Default"), _("Just _Log In"), TRUE); g_free (firstmsg); diff --git a/gui/greeter/greeter.c b/gui/greeter/greeter.c index 4a0cdf13..86704baa 100644 --- a/gui/greeter/greeter.c +++ b/gui/greeter/greeter.c @@ -332,10 +332,10 @@ process_operation (guchar op_code, case SESSION_LOOKUP_PREFERRED_MISSING: firstmsg = g_strdup_printf (_("Do you wish to make %s the default for " "future sessions?"), - gdm_session_name (tmp)); + gdm_session_name (gdm_get_default_session ())); secondmsg = g_strdup_printf (_("Your preferred session type %s is not " "installed on this computer."), - gdm_session_name (gdm_get_default_session ())); + gdm_session_name (tmp)); save_session = gdm_wm_query_dialog (firstmsg, secondmsg, _("Make _Default"), _("Just _Log In"), TRUE); |