[gdm/gnome-3-8] slave: don't assume autologin if there are no connections

[Ray Strode <halfline src gnome org>]

commit 18043ceed09300ab338f5adf65e489fdf987250f
Author: Ray Strode <rstrode redhat com>
Date:   Mon Jul 1 07:44:00 2013 -0400

    slave: don't assume autologin if there are no connections
    
    Because of a bug in gdm-session.c (which was dealt with in
    the previous commit) we ended up with a false impression of currently
    connected clients after a session reset happens.
    
    That bug meant the slave assumed autologin was enabled which
    stopped it from waiting for the greeter to finish the fade out before
    proceeding.
    
    Assuming "no connection" == "autologin" is a bit fragile, so this
    commit makes sure to check for gdm-autologin specifically.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=703386

 daemon/gdm-simple-slave.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index df586ce..217c33b 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -593,13 +593,14 @@ on_session_opened (GdmSession       *session,
         gdm_simple_slave_grant_console_permissions (slave);
 #endif  /* HAVE_LOGINDEVPERM */
 
-        if (gdm_session_client_is_connected (slave->priv->session)) {
-                gdm_simple_slave_start_session_when_ready (slave, service_name);
-        } else {
-                /* Auto login */
+        if (g_strcmp0 (service_name, "gdm-autologin") == 0 &&
+            !gdm_session_client_is_connected (slave->priv->session)) {
+                /* If we're auto logging in then don't wait for the go-ahead from a greeter,
+                 * (since there is no greeter) */
                 slave->priv->start_session_when_ready = TRUE;
-                gdm_simple_slave_start_session_when_ready (slave, service_name);
         }
+
+        gdm_simple_slave_start_session_when_ready (slave, service_name);
 }
 
 static void