summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-03 19:02:56 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-09-03 19:02:56 -0700
commit49b50db0cb1ecc5611a242d12b9ca05b961c91ac (patch)
treed1faaa2f6939babececb1ff9f444dc64710b0130
parent78d181dc74ffb3e67ee0d90780b86e00e03073eb (diff)
launchd: Include LAUNCHD_ID_PREFIX in the socket name for reverse lookup to tell which launchd id owns $DISPLAY
-rw-r--r--Makefile.am2
-rw-r--r--org.x.startx.plist.cpp4
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>