|
 |
860c18d |
From aafa4070f2905c4848091a78422210951775cd9a Mon Sep 17 00:00:00 2001
|
|
|
860c18d |
From: Ray Strode <rstrode@redhat.com>
|
|
|
860c18d |
Date: Thu, 6 Sep 2012 18:20:05 -0400
|
|
|
860c18d |
Subject: [PATCH] slave: fix autologin
|
|
|
860c18d |
|
|
|
860c18d |
An inverted condition in the wants_autologin function means we tried
|
|
|
860c18d |
to start greeter when autologin is runnings.
|
|
|
860c18d |
|
|
|
860c18d |
Since autologin is usually much faster than loading GL/gnome-shell, this bug
|
|
|
860c18d |
is sort of spotty to reproduce.
|
|
|
860c18d |
|
|
|
860c18d |
This commit changes the "delay > 0" check to "delay == 0" which is a
|
|
|
860c18d |
correct indicator of autologin.
|
|
|
860c18d |
|
|
|
860c18d |
https://bugzilla.gnome.org/show_bug.cgi?id=682465
|
|
|
860c18d |
---
|
|
|
860c18d |
daemon/gdm-simple-slave.c | 2 +-
|
|
|
860c18d |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
860c18d |
|
|
|
860c18d |
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
|
|
|
860c18d |
index b646b78..563f6ed 100644
|
|
|
860c18d |
--- a/daemon/gdm-simple-slave.c
|
|
|
860c18d |
+++ b/daemon/gdm-simple-slave.c
|
|
|
860c18d |
@@ -1215,7 +1215,7 @@ wants_autologin (GdmSimpleSlave *slave)
|
|
|
860c18d |
/* FIXME: handle wait-for-go */
|
|
|
860c18d |
|
|
|
860c18d |
gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, NULL, &delay);
|
|
|
860c18d |
- return enabled && delay > 0;
|
|
|
860c18d |
+ return enabled && delay == 0;
|
|
|
860c18d |
}
|
|
|
860c18d |
|
|
|
860c18d |
#define INITIAL_SETUP_TRIGGER_FILE LOCALSTATEDIR "/lib/gdm/run-initial-setup"
|
|
|
860c18d |
--
|
|
|
860c18d |
1.7.12
|
|
|
860c18d |
|