diff options
| author | Ray Strode <rstrode@redhat.com> | 2012-10-04 17:36:57 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2013-01-21 10:16:34 -0500 |
| commit | 12ba97b9741a9f1691f2ef7417871c148dd9fa09 (patch) | |
| tree | 9ce73eb870622142794964c2bc459251d6a64937 | |
| parent | 7f24364f518fe96d5c4f9deddb75410a7a62eca1 (diff) | |
| download | gdm-12ba97b9741a9f1691f2ef7417871c148dd9fa09.tar.gz | |
slave: only set up autologin conversations
Right now any time any session conversation is started,
we run its setup call if autologin is enabled. We should only do this
for autologin sessions, otherwise, we may repeat work done by
the greeter.
https://bugzilla.gnome.org/show_bug.cgi?id=682467
(cherry picked from commit 47c73024739a65614c6a0ddcdd1c08239798044a)
| -rw-r--r-- | daemon/gdm-simple-slave.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 59b0627f..14756717 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -485,8 +485,12 @@ on_session_conversation_started (GdmSession *session, char *username; int delay; + g_debug ("GdmSimpleSlave: session conversation started for service %s", service_name); + + if (g_strcmp0 (service_name, "gdm-autologin") != 0) { + return; + } - g_debug ("GdmSimpleSlave: session conversation started"); enabled = FALSE; gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); if (! enabled) { |