summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHalton Huo <halton.huo@sun.com>2009-11-27 23:20:52 +0800
committerHalton Huo <halton.huo@sun.com>2009-11-27 23:20:52 +0800
commitac59f33080692222bc8e24f59d12d4bbec2f7931 (patch)
tree9a76d97ae5a99ff3e71aea3e8ceeb2d375f78671
parenta720673cc6dff0677213f21b6e3c8cf2e760379d (diff)
downloadgdm-ac59f33080692222bc8e24f59d12d4bbec2f7931.tar.gz
Fix dead-waiting for last commit, we try to wait 5 seconds.
-rw-r--r--daemon/gdm-server.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index 6408d042..757ef62f 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -630,6 +630,7 @@ gdm_server_spawn (GdmServer *server,
if ((tmp = strstr (server->priv->display_name, ":")) != NULL) {
char *socket_file;
int display_num;
+ int count;
char *p;
tmp++;
@@ -637,10 +638,12 @@ gdm_server_spawn (GdmServer *server,
socket_file = g_strdup_printf ("/tmp/.X11-unix/X%d",
display_num);
- while (1) {
+ count = 0;
+ while (count < 5) {
if (!g_file_test (socket_file, G_FILE_TEST_EXISTS))
break;
sleep (1);
+ count ++;
}
g_free (socket_file);
}