summaryrefslogtreecommitdiff
path: root/src/seat.c
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2017-09-21 14:37:37 +1200
committerRobert Ancell <robert.ancell@canonical.com>2017-09-21 14:37:37 +1200
commit2b7eaa44d401a0a187917e53385d079e688f5172 (patch)
tree9f2da4649bd39b2d477d2608e272b603fc978378 /src/seat.c
parentab1e8bfea80d2768adeb030b09a14b536be3330e (diff)
downloadlightdm-git-2b7eaa44d401a0a187917e53385d079e688f5172.tar.gz
Fix timed autologins not using autologin-session when no session specified
Diffstat (limited to 'src/seat.c')
-rw-r--r--src/seat.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/seat.c b/src/seat.c
index ace2ad66..0b5df01b 100644
--- a/src/seat.c
+++ b/src/seat.c
@@ -1206,6 +1206,13 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi
user = session_get_user (session);
if (user)
{
+ const gchar *autologin_username;
+
+ /* Override session for autologin if configured */
+ autologin_username = seat_get_string_property (seat, "autologin-user");
+ if (!session_name && g_strcmp0 (user_get_name (user), autologin_username) == 0)
+ session_name = seat_get_string_property (seat, "autologin-session");
+
if (!session_name)
session_name = user_get_xsession (user);
language = user_get_language (user);