hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-09-27 21:22:26 +00:00
Code Issues Projects Releases Wiki Activity

XQuartz: Remove the redundant xquartz_resetenv_display

Browse source 
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
This commit is contained in:
Jeremy Huddleston 2009-09-28 23:01:59 -07:00
commit f3223c71cf
2 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hw/xquartz/mach-startup/bundle-main.c
View file

@ -62,8 +62,6 @@ void DarwinListenOnOpenFD(int fd);
extern int noPanoramiXExtension;
extern int xquartz_resetenv_display;
#define DEFAULT_CLIENT X11BINDIR "/xterm"
#define DEFAULT_STARTX X11BINDIR "/startx"
#define DEFAULT_SHELL "/bin/sh"
@ -429,9 +427,6 @@ static int startup_trigger(int argc, char **argv, char **envp) {
if((s = getenv("DISPLAY"))) {
fprintf(stderr, "X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting). Starting X server.\n", s);
unsetenv("DISPLAY");
/* This tells X11Controller to not use the environment's DISPLAY and reset it based on the server's display */
xquartz_resetenv_display = 1;
} else {
fprintf(stderr, "X11.app: Could not connect to server (DISPLAY is not set). Starting X server.\n");
}