diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2015-08-10 15:40:51 +1200 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2015-08-10 15:40:51 +1200 |
commit | 2951f3ad5d4937e76883502842ccc0074cc75862 (patch) | |
tree | 937d15cc97468bcbacbccf1f953dbc07b8755238 /src | |
parent | e02cee89092b183898e7d8e539a16e663b3921e3 (diff) | |
parent | baf1027424c79b584a6305b7c143766141e6767d (diff) | |
download | lightdm-2951f3ad5d4937e76883502842ccc0074cc75862.tar.gz |
Merge with trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 3 | ||||
-rw-r--r-- | src/seat.c | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 18e8240f..b56b9140 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -112,6 +112,3 @@ lightdm_guest_session_CFLAGS = \ EXTRA_DIST = \ display-manager.xml - -DISTCLEANFILES = \ - Makefile.in @@ -1029,6 +1029,14 @@ create_user_session (Seat *seat, const gchar *username, gboolean autostart) session_name = user_get_xsession (user); language = user_get_language (user); + /* Override session for autologin if configured */ + if (autostart) + { + const gchar *autologin_session_name = seat_get_string_property (seat, "autologin-session"); + if (autologin_session_name) + session_name = autologin_session_name; + } + if (!session_name) session_name = seat_get_string_property (seat, "user-session"); sessions_dir = config_get_string (config_get_instance (), "LightDM", "sessions-directory"); |