diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-09-28 23:01:59 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2009-10-19 12:54:45 -0700 |
| commit | 31c6fc76733490117c75697d28b7dfb25cc4537c (patch) | |
| tree | a96b3556687cc3e8ec3addcf1a40b8554797788f | |
| parent | 37b5f41ccea3473b830cc0c4afb5d609e47004cb (diff) | |
XQuartz: Remove the redundant xquartz_resetenv_display
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
(cherry picked from commit f3223c71cfc638e695981e527517d48ea00d124d)
| -rw-r--r-- | hw/xquartz/X11Controller.m | 4 | ||||
| -rw-r--r-- | hw/xquartz/mach-startup/bundle-main.c | 5 |
2 files changed, 1 insertions, 8 deletions
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m index d8d23ec2f..119154764 100644 --- a/hw/xquartz/X11Controller.m +++ b/hw/xquartz/X11Controller.m @@ -52,8 +52,6 @@ #include <sys/types.h> #include <sys/wait.h> -BOOL xquartz_resetenv_display = NO; - @implementation X11Controller - (void) awakeFromNib @@ -353,7 +351,7 @@ BOOL xquartz_resetenv_display = NO; newargv[3] = NULL; s = getenv("DISPLAY"); - if (xquartz_resetenv_display || s == NULL || s[0] == 0) { + if (s == NULL || s[0] == 0) { snprintf(buf, sizeof(buf), ":%s", display); setenv("DISPLAY", buf, TRUE); } diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c index 146ea11d8..691b5555e 100644 --- a/hw/xquartz/mach-startup/bundle-main.c +++ b/hw/xquartz/mach-startup/bundle-main.c @@ -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"); } |