fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2025-12-21 13:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Xquartz: Fix multiple-dock icons (pt2)

Browse source 
In the last commit, I accidently committed the wrong change to bundle-main.c from another failed attempt.  Sorry, this should work now.
This commit is contained in:
Jeremy Huddleston 2007-12-08 00:25:23 -08:00
parent 0502955a2a
commit d0dca8a885
1 changed files with 26 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
hw/xquartz/bundle/bundle-main.c
View file

@ -37,39 +37,36 @@ int launcher_main(int argc, char **argv);
int server_main(int argc, char **argv); int server_main(int argc, char **argv);
int main(int argc, char **argv) { int main(int argc, char **argv) {
int launchd = 0; Display *display;
size_t i;
int retval;
fprintf(stderr, "X11.app: main(): argc=%d\n", argc); //size_t i;
for(i=0; i < argc; i++) { //fprintf(stderr, "X11.app: main(): argc=%d\n", argc);
fprintf(stderr, "\targv[%u] = %s\n", (unsigned)i, argv[i]); //for(i=0; i < argc; i++) {
} // fprintf(stderr, "\targv[%u] = %s\n", (unsigned)i, argv[i]);
//}
/* First check if launchd started us */ /* If we have a process serial number and it's our only arg, act as if
for(i=1; i < argc; i++) { * the user double clicked the app bundle: launch app_to_run if possible
if(!strncmp(argv[i], "-launchd", 8)) { */
launchd = 1; if(argc == 1 || (argc == 2 && !strncmp(argv[1], "-psn_", 5))) {
break; /* Now, try to open a display, if so, run the launcher */
} display = XOpenDisplay(NULL);
} if(display) {
fprintf(stderr, "X11.app: main(): closing the display");
/* Could open the display, start the launcher */
XCloseDisplay(display);
/* Start the server */
fprintf(stderr, "X11.app: main(): running server_main()");
retval = server_main(argc, argv);
if(retval != 0)
return retval;
/* If we weren't started by launcd, then run the launcher. */
if(!launchd) {
/* Give 2 seconds for the server to start... /* Give 2 seconds for the server to start...
* TODO: *Really* fix this race condition * TODO: *Really* fix this race condition
*/ */
usleep(2000); usleep(2000);
fprintf(stderr, "X11.app: main(): running launcher_main()"); //fprintf(stderr, "X11.app: main(): running launcher_main()");
return launcher_main(argc, argv); return launcher_main(argc, argv);
} }
}
return 0; /* Start the server */
//fprintf(stderr, "X11.app: main(): running server_main()");
return server_main(argc, argv);
} }