From 13a92c1d78aa678a87691042148022dacc9c4f22 Mon Sep 17 00:00:00 2001
From: root <root@dgod.(none)>
Date: Thu, 29 Dec 2011 17:19:49 +0800
Subject: [PATCH] readd the tcp_listen option

---
 data/lxdm.conf.in |    2 ++
 src/lxdm.c        |    9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/data/lxdm.conf.in b/data/lxdm.conf.in
index dd94686..2de2b94 100644
--- a/data/lxdm.conf.in
+++ b/data/lxdm.conf.in
@@ -21,6 +21,8 @@ greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk
 [server]
 ## arg used to start xserver, not fully function
 # arg=/usr/bin/X -background vt1
+# uncomment this if you really want xserver listen to tcp
+# tcp_listen=1
 
 [display]
 ## gtk theme used by greeter
diff --git a/src/lxdm.c b/src/lxdm.c
index 5c279af..b5a90be 100644
--- a/src/lxdm.c
+++ b/src/lxdm.c
@@ -467,7 +467,7 @@ static char *lxsession_xserver_command(LXSession *s)
 			i++;
 		}
 	}
-printf("arc %d\n",arc);
+
 	arg = g_renew(char *, arg, arc + 10);
 	if(nr_tty)
 	{
@@ -477,8 +477,11 @@ printf("arc %d\n",arc);
 	arg[arc++] = g_strdup_printf(":%d",s->display);
 	if(s->tty>0)
 		arg[arc++] = g_strdup_printf("vt%02d", s->tty);
-	arg[arc++] = g_strdup("-nolisten");
-	arg[arc++] = g_strdup("tcp");
+	if(g_key_file_get_integer(config,"server","tcp_listen",0)!=1)
+	{
+		arg[arc++] = g_strdup("-nolisten");
+		arg[arc++] = g_strdup("tcp");
+	}
 	arg[arc] = NULL;
 	p=g_strjoinv(" ", arg);
 	g_strfreev(arg);
-- 
1.7.4.1