andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed bug in x11-exec that prevent icon from showing up

Browse Source 
(cherry picked from commit e1f4a0c20d)
This commit is contained in:
Ben Byer 2007-12-13 20:40:27 -08:00 committed by Jeremy Huddleston
parent 95c02adea8
commit 062d9234e2
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/xquartz/x11-exec.c
View File

@ -28,7 +28,7 @@
promote the sale, use or other dealings in this Software without promote the sale, use or other dealings in this Software without
prior written authorization. */ prior written authorization. */
#include <ApplicationServices/ApplicationServices.h> #include <CoreServices/CoreServices.h>
#include <stdio.h> #include <stdio.h>
#define kX11AppBundleId "org.x.X11" #define kX11AppBundleId "org.x.X11"
@ -36,10 +36,10 @@
int main(int argc, char **argv) { int main(int argc, char **argv) {
char x11_path[PATH_MAX]; char x11_path[PATH_MAX];
char** args = NULL;
CFURLRef appURL = NULL; CFURLRef appURL = NULL;
OSStatus osstatus = OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId),
LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
nil, nil, &appURL);
switch (osstatus) { switch (osstatus) {
case noErr: case noErr:
@ -52,10 +52,20 @@ int main(int argc, char **argv) {
fprintf(stderr, "%s: Error resolving URL for %s\n", argv[0], kX11AppBundleId); fprintf(stderr, "%s: Error resolving URL for %s\n", argv[0], kX11AppBundleId);
exit(2); exit(2);
} }
strlcpy(argv[0], "X11", strlen(argv[0])+1);
args = (char**)malloc(sizeof (char*) * (argc + 1));
strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path)); strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
// fprintf(stderr, "X11.app = %s\n", x11_path); if (args) {
execv(x11_path, argv); int i;
args[0] = x11_path;
for (i = 1; i < argc; ++i) {
args[i] = argv[i];
}
args[i] = NULL;
}
fprintf(stderr, "X11.app = %s\n", x11_path);
execv(x11_path, args);
fprintf(stderr, "Error executing X11.app (%s):", x11_path); fprintf(stderr, "Error executing X11.app (%s):", x11_path);
perror(NULL); perror(NULL);
exit(3); exit(3);