summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-17 20:47:26 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-17 20:47:26 -0800
commit5e68e94d852c730ef9264fc0d8ca61a2ffe98b53 (patch)
tree99dfb63b092bc6c8bb4bb01bcc73681fa2f76d4b
parent7aca689ce14d314b5c8c72c8df76f53f76ab467c (diff)
Force local transport when using the launchd socket.
Fixes a regression due to bf53987eaf0fbd7f7627783fc39e7ee99e8361ba
-rw-r--r--src/ConnDis.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ConnDis.c b/src/ConnDis.c
index f32b0925..0ecd71c3 100644
--- a/src/ConnDis.c
+++ b/src/ConnDis.c
@@ -298,10 +298,11 @@ _X11TransConnectDisplay (
} else
#endif
#ifdef HAVE_LAUNCHD
- if (!phostname || phostname[0]=='/')
-#else
- if (!phostname)
+ if (phostname && phostname[0]=='/') {
+ pprotocol = copystring ("local", 5);
+ }
#endif
+ if (!phostname)
{
if (local_transport[0] != NULL) {
pprotocol = Xstrdup(local_transport[0]);