gdm r6181 - in trunk: . daemon

[mccann svn gnome org]

Author: mccann
Date: Tue Apr 29 19:19:33 2008
New Revision: 6181
URL: http://svn.gnome.org/viewvc/gdm?rev=6181&view=rev

Log:
2008-04-29  William Jon McCann  <jmccann redhat com>

	* daemon/gdm-simple-slave.c (start_session_timeout),
	(on_session_accreditation_failed):
	Revert svn change 6041 from 2008-03-18.
	We don't stop the slave after migrating because
	when Xorg exits it switches to the VT it was
	started from.  That interferes with fast
	user switching.  We'll want to start using
	a factory greeter soon.



Modified:
   trunk/ChangeLog
   trunk/daemon/gdm-simple-slave.c

Modified: trunk/daemon/gdm-simple-slave.c
==============================================================================
--- trunk/daemon/gdm-simple-slave.c	(original)
+++ trunk/daemon/gdm-simple-slave.c	Tue Apr 29 19:19:33 2008
@@ -289,7 +289,11 @@
                         slave->priv->session = NULL;
                 }
 
-                gdm_slave_stopped (GDM_SLAVE (slave));
+                /* We don't stop the slave here because
+                   when Xorg exits it switches to the VT it was
+                   started from.  That interferes with fast
+                   user switching. */
+                queue_greeter_reset (slave);
 
                 goto out;
         }
@@ -346,15 +350,17 @@
            accreditation fails */
         if (! migrated) {
                 gdm_greeter_server_problem (slave->priv->greeter_server, _("Unable establish credentials"));
-        } else {
+        }
 
-                if (slave->priv->session != NULL) {
-                        gdm_session_close (GDM_SESSION (slave->priv->session));
-                        g_object_unref (slave->priv->session);
-                        slave->priv->session = NULL;
-                }
+        /* We don't stop the slave here after migrating because
+           when Xorg exits it switches to the VT it was
+           started from.  That interferes with fast
+           user switching. */
 
-                gdm_slave_stopped (GDM_SLAVE (slave));
+        if (slave->priv->session != NULL) {
+                gdm_session_close (GDM_SESSION (slave->priv->session));
+                g_object_unref (slave->priv->session);
+                slave->priv->session = NULL;
         }
 
         queue_greeter_reset (slave);