Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Adam Jackson
xserver
Commits
ca64b594
Commit
ca64b594
authored
Nov 21, 2008
by
Jeremy Huddleston
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XQuartz: Don't use LS to find X11.app on Tiger.
(cherry picked from commit
e62107e5
)
parent
701f8e3a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
hw/xquartz/mach-startup/stub.c
hw/xquartz/mach-startup/stub.c
+8
-0
No files found.
hw/xquartz/mach-startup/stub.c
View file @
ca64b594
...
...
@@ -50,6 +50,8 @@
#include <signal.h>
#include <AvailabilityMacros.h>
#include "launchd_fd.h"
#ifndef BUILD_DATE
...
...
@@ -66,6 +68,8 @@ static char x11_path[PATH_MAX + 1];
static
pid_t
x11app_pid
=
0
;
static
void
set_x11_path
()
{
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
CFURLRef
appURL
=
NULL
;
CFBundleRef
bundle
=
NULL
;
OSStatus
osstatus
=
LSFindApplicationForInfo
(
kLSUnknownCreator
,
CFSTR
(
kX11AppBundleId
),
nil
,
nil
,
&
appURL
);
...
...
@@ -117,6 +121,10 @@ static void set_x11_path() {
kX11AppBundleId
,
(
int
)
osstatus
);
exit
(
11
);
}
#else
/* TODO: Make Tiger smarter... but TBH, this should never get called on Tiger... */
strlcpy
(
x11_path
,
"/Applications/Utilities/X11.app/Contents/MacOS/X11"
,
sizeof
(
x11_path
));
#endif
}
static
int
connect_to_socket
(
const
char
*
filename
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment