From 49b50db0cb1ecc5611a242d12b9ca05b961c91ac Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Thu, 3 Sep 2009 19:02:56 -0700
Subject: launchd: Include LAUNCHD_ID_PREFIX in the socket name for reverse
 lookup to tell which launchd id owns $DISPLAY

---
 Makefile.am            | 2 +-
 org.x.startx.plist.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a9ae6c1..ae7ad77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,7 +57,7 @@ CPP_FILES_FLAGS = \
 	-DSHELL_CMD=$(SHELL_CMD) $(STARTX_COOKIE_FLAGS) \
 	-D__libexecdir__="$(libexecdir)" \
 	-D__bindir__="$(bindir)" \
-	-DLAUNCHD_ID_PREFIX=\"$(launchdidprefix)\"
+	-DLAUNCHD_ID_PREFIX="$(launchdidprefix)"
 
 if LAUNCHD
 $(launchdidprefix).startx.plist.cpp: org.x.startx.plist.cpp
diff --git a/org.x.startx.plist.cpp b/org.x.startx.plist.cpp
index 4f3ce74..845ce0e 100644
--- a/org.x.startx.plist.cpp
+++ b/org.x.startx.plist.cpp
@@ -3,14 +3,14 @@
 <plist version="1.0">
 <dict>
 	<key>Label</key>
-		<string>org.x.startx</string>
+		<string>LAUNCHD_ID_PREFIX.startx</string>
 	<key>ProgramArguments</key>
 		<array>
 			<string>__bindir__/startx</string>
 		</array>
 	<key>Sockets</key>
 		<dict>
-			<key>:0</key>
+			<key>LAUNCHD_ID_PREFIX-:0</key>
 				<dict>
 					<key>SecureSocketWithKey</key>
 						<string>DISPLAY</string>
-- 
cgit v1.2.3