diff options
| author | Philippe Troin <phil@fifi.org> | 2014-09-02 15:28:17 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2014-09-02 15:30:21 -0400 |
| commit | a0e7097abee606d82315137a0a5fa143fb175d3c (patch) | |
| tree | 99164cc59c87dae191bf383b93178e38ec429b9e | |
| parent | abaa3e6cd96ca80560848f17a6a314c8405735d6 (diff) | |
| download | gdm-a0e7097abee606d82315137a0a5fa143fb175d3c.tar.gz | |
daemon: allow multiple time logins to work
GDM currently lumps timed login with autologin when deciding whether or
not to skip it, if it's already happened once this boot.
That's the wrong behavior, and indeed will create a confused experience,
because it's not what the login screen provided by gnome-shell
expects.
This commit allows timed login to work after the user logs out.
https://bugzilla.gnome.org/show_bug.cgi?id=732774
| -rw-r--r-- | daemon/gdm-manager.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index 6349c1e6..16eeaf64 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -1808,13 +1808,14 @@ start_autologin_conversation_if_necessary (GdmManager *manager, GdmSession *session) { gboolean enabled; + int delay; - if (g_file_test (GDM_RAN_ONCE_MARKER_FILE, G_FILE_TEST_EXISTS)) { + gdm_display_get_timed_login_details (display, &enabled, NULL, NULL, NULL); + + if (delay == 0 && g_file_test (GDM_RAN_ONCE_MARKER_FILE, G_FILE_TEST_EXISTS)) { return; } - gdm_display_get_timed_login_details (display, &enabled, NULL, NULL, NULL); - if (!enabled) { return; } |