diff options
| author | Leena Gunda <leena.gunda@wipro.com> | 2005-05-10 06:37:05 +0000 |
|---|---|---|
| committer | Leena Sitaram Gunda <lsgunda@src.gnome.org> | 2005-05-10 06:37:05 +0000 |
| commit | 4f7b7a30ba7b8432c6decfd0afb587ce3276726c (patch) | |
| tree | 38ece0e40a381978b4595afe17fbfcd363908276 | |
| parent | 4c8b5cb881013afbf96811d6bd2f1da6618532d3 (diff) | |
| download | gdm-4f7b7a30ba7b8432c6decfd0afb587ce3276726c.tar.gz | |
Check if a host has been selected from XDMCP chooser and change servstat
2005-05-10 Leena Gunda <leena.gunda@wipro.com>
* daemon/server.c (do_server_wait): Check if a host
has been selected from XDMCP chooser and change
servstat accordingly. Fixes bug where Xnest session
quits when a host is selected from XDMCP chooser.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | daemon/server.c | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +2005-05-10 Leena Gunda <leena.gunda@wipro.com> + + * daemon/server.c (do_server_wait): Check if a host + has been selected from XDMCP chooser and change + servstat accordingly. Fixes bug where Xnest session + quits when a host is selected from XDMCP chooser. + 2005-05-06 Brian Cameron <brian.cameron@sun.com> * daemon/auth.c, daemon/display.c, daemon/gdm.[ch], diff --git a/daemon/server.c b/daemon/server.c index fb0aa6bb..e9cd3aef 100644 --- a/daemon/server.c +++ b/daemon/server.c @@ -563,7 +563,7 @@ do_server_wait (GdmDisplay *d) { /* Wait for X server to send ready signal */ if (d->servstat == SERVER_PENDING) { - if (d->server_uid != 0 && ! d->handled) { + if (d->server_uid != 0 && ! d->handled && ! d->chosen_hostname) { /* FIXME: If not handled, we just don't know, so * just wait a few seconds and hope things just work, * fortunately there is no such case yet and probably |