frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Don't use LS to find X11.app on Tiger. 

(cherry picked from commit e62107e55261ef252a2a24dd26a60e5dd295d560)
This commit is contained in:
Jeremy Huddleston 2008-11-21 11:20:31 -08:00
parent 701f8e3a94
commit ca64b5949d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/xquartz/mach-startup/stub.c
View File

@ -50,6 +50,8 @@
#include <signal.h> #include <signal.h>
#include <AvailabilityMacros.h>
#include "launchd_fd.h" #include "launchd_fd.h"
#ifndef BUILD_DATE #ifndef BUILD_DATE
@ -66,6 +68,8 @@ static char x11_path[PATH_MAX + 1];
static pid_t x11app_pid = 0; static pid_t x11app_pid = 0;
static void set_x11_path() { static void set_x11_path() {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
CFURLRef appURL = NULL; CFURLRef appURL = NULL;
CFBundleRef bundle = NULL; CFBundleRef bundle = NULL;
OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL); OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
@ -117,6 +121,10 @@ static void set_x11_path() {
kX11AppBundleId, (int)osstatus); kX11AppBundleId, (int)osstatus);
exit(11); 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) { static int connect_to_socket(const char *filename) {