[gdm/f18] Fix subsequent logins after autologin

[Ray Strode]

commit 024422a0fc45b9cf475cda0be130a4dbcecc2640
Author: Ray Strode <rstrode at redhat.com>
Date:   Mon Dec 17 15:29:15 2012 -0500

    Fix subsequent logins after autologin
    
    Resolves: #881896

 fix-autologin.patch |   36 ++++++++++++++++++++++++++++++++++++
 gdm.spec            |    8 +++++++-
 2 files changed, 43 insertions(+), 1 deletions(-)
---
diff --git a/fix-autologin.patch b/fix-autologin.patch
new file mode 100644
index 0000000..7f95b3a
--- /dev/null
+++ b/fix-autologin.patch
@@ -0,0 +1,36 @@
+From 47c73024739a65614c6a0ddcdd1c08239798044a Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode at redhat.com>
+Date: Thu, 4 Oct 2012 17:36:57 -0400
+Subject: [PATCH] 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
+---
+ daemon/gdm-simple-slave.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
+index 9bc8522..4bbf503 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) {
+-- 
+1.8.0.2
+
diff --git a/gdm.spec b/gdm.spec
index da6fd0b..fdb3688 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -9,7 +9,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 3.6.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -92,6 +92,7 @@ Obsoletes: gdm-plugin-fingerprint < 1:3.2.1
 Provides: gdm-plugin-fingerprint = %{epoch}:%{version}-%{release}
 
 Patch0: usefamilywild.patch
+Patch1: fix-autologin.patch
 
 %package libs
 Summary: Client-side library to talk to gdm
@@ -121,6 +122,7 @@ Development files and headers for writing GDM greeters.
 %prep
 %setup -q
 %patch0 -p1 -b .usefamilywild
+%patch1 -p1 -b .fix-autologin
 
 autoreconf -i -f
 intltoolize -f
@@ -349,6 +351,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/girepository-1.0/Gdm-1.0.typelib
 
 %changelog
+* Mon Dec 17 2012 Ray Strode <rstrode at redhat.com> 3.6.2-4
+- Make normal login after autologin work
+  Resolves: #881896
+
 * Mon Dec 10 2012 Ray Strode <rstrode at redhat.com> 3.6.2-3
 - Make Xauthority file more hostname change resistant.
   Related: #885217