diff options
| author | William Jon McCann <jmccann@redhat.com> | 2008-04-29 19:19:33 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2008-04-29 19:19:33 +0000 |
| commit | 181cdb84425f8118b51fe12c1cf277a8ae636d32 (patch) | |
| tree | cd4f5cab0e6dc3791987bdf9cad6cad0c5d52b5d /daemon | |
| parent | 28ace53c478eed2b37145ac65b47a43aa8164a96 (diff) | |
| download | gdm-181cdb84425f8118b51fe12c1cf277a8ae636d32.tar.gz | |
Revert svn change 6041 from 2008-03-18. We don't stop the slave after
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.
svn path=/trunk/; revision=6181
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/gdm-simple-slave.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c index 2751fa3e..1242db26 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c @@ -289,7 +289,11 @@ start_session_timeout (GdmSimpleSlave *slave) 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 @@ on_session_accreditation_failed (GdmSession *session, 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); |