summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-28 11:20:25 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-11-28 11:20:25 -0800
commitf04db53e71c681379ec49494c9ab727bc5269b30 (patch)
tree9775e3595ed6e2d65e4f80d40d5b96ce5534788c
parented6dc88f5cbaaad08a282c44ae333a938f6f4216 (diff)
OSX Tiger: More compilation fixes...
-rw-r--r--privileged_startx/server.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/privileged_startx/server.c b/privileged_startx/server.c
index d0356b5..bfe7ca4 100644
--- a/privileged_startx/server.c
+++ b/privileged_startx/server.c
@@ -153,7 +153,7 @@ int server_main(const char *dir) {
mp = launch_data_get_machport(svc);
#else
- kr = bootstrap_check_in(bootstrap_port, bname, &mp);
+ kr = bootstrap_check_in(bootstrap_port, "org.x.X11", &mp);
if (kr == KERN_SUCCESS)
return mp;
@@ -209,8 +209,10 @@ kern_return_t do_privileged_startx(mach_port_t test_port __attribute__((unused))
const char * path_argv[2] = {script_dir, NULL};
+#ifdef LAUNCH_JOBKEY_MACHSERVICES
/* Store that we were called, so the idle timer will reset */
gettimeofday(&idle_globals.lastmsg, NULL);
+#endif
/* script_dir contains a set of files to run with root privs when X11 starts */
ftsp = fts_open(path_argv, FTS_PHYSICAL, ftscmp);