summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2011-09-22 15:10:43 +1000
committerRobert Ancell <robert.ancell@canonical.com>2011-09-22 15:10:43 +1000
commit87407c5afc37075a417c92ad04711fdf8cfddaec (patch)
treec35d04163a84c78c071e68de337e28f498ffa0a8
parentd6410e597ac85de7f8a328a789492df64e38f4ac (diff)
downloadlightdm-87407c5afc37075a417c92ad04711fdf8cfddaec.tar.gz
Make sure one session is always selected in the GTK greeter
-rw-r--r--NEWS1
-rw-r--r--greeters/gtk/lightdm-gtk-greeter.c6
2 files changed, 7 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 08a70f50..27c259bc 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Overview of changes in lightdm 0.9.8
* Fix multi-seat configuration picking the same display number
* Use correct D-Bus and power interface in liblightdm-qt
* Run pam_setcred inside the session process so pam_group works
+ * Make sure one session is always selected in the GTK greeter
Overview of changes in lightdm 0.9.7
diff --git a/greeters/gtk/lightdm-gtk-greeter.c b/greeters/gtk/lightdm-gtk-greeter.c
index 13c44ee6..38c014a5 100644
--- a/greeters/gtk/lightdm-gtk-greeter.c
+++ b/greeters/gtk/lightdm-gtk-greeter.c
@@ -70,7 +70,13 @@ set_session (const gchar *session)
/* If failed to find this session, then try the default */
default_session = lightdm_greeter_get_default_session_hint (greeter);
if (default_session && g_strcmp0 (session, default_session) != 0)
+ {
set_session (lightdm_greeter_get_default_session_hint (greeter));
+ return;
+ }
+
+ /* Otherwise just pick the first session */
+ gtk_combo_box_set_active (session_combo, 0);
}
static gchar *