summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2012-10-04 17:36:57 -0400
committerRay Strode <rstrode@redhat.com>2012-10-15 15:04:50 -0400
commit47c73024739a65614c6a0ddcdd1c08239798044a (patch)
tree020aa2617f8d44da39dee240deef8852bf4bace2
parent081fc256e106313dc754f8178ac489ce1763f82d (diff)
downloadgdm-47c73024739a65614c6a0ddcdd1c08239798044a.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
-rw-r--r--daemon/gdm-simple-slave.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 9bc85226..4bbf503c 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) {