diff options
| author | Ray Strode <rstrode@redhat.com> | 2014-03-21 12:35:36 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2014-03-21 12:37:22 -0400 |
| commit | 7140b963e4ad9b58db80190c4a05e43ea6f8a5eb (patch) | |
| tree | 58c5325a436a4b570283a8f13fd989a0dd194a3f | |
| parent | 9f0402c050a0d3b0bb8661263a900f42f5f669c5 (diff) | |
| download | gdm-7140b963e4ad9b58db80190c4a05e43ea6f8a5eb.tar.gz | |
manager: wait until autologin is initiated before marking it so
When the slave was merged to the main daemon process, the code for
doing autologin accounting was accidentally moved earlier in the
autologin process. This caused the greeter to create a login
screen and do autologin at the same time.
This commit defers the accounting until after the operation is
fully initiated.
https://bugzilla.gnome.org/show_bug.cgi?id=726813
| -rw-r--r-- | daemon/gdm-manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index b0a1d5f4..631350b8 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -106,6 +106,7 @@ static void gdm_manager_finalize (GObject *object); static void create_seed_session_for_display (GdmManager *manager, GdmDisplay *display, uid_t allowed_user); +static void touch_marker_file (GdmManager *manager); static gpointer manager_object = NULL; @@ -1203,6 +1204,7 @@ set_up_greeter_session (GdmManager *manager, g_free (allowed_user); gdm_display_start_greeter_session (display); + touch_marker_file (manager); } static void @@ -1965,7 +1967,6 @@ create_seed_session_for_display (GdmManager *manager, g_object_set_data_full (G_OBJECT (display), "gdm-seed-session", g_object_ref (session), (GDestroyNotify) g_object_unref); start_autologin_conversation_if_necessary (manager, display, session); - touch_marker_file (manager); } static void |