diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-12-08 21:00:11 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2008-12-10 15:07:26 -0800 |
| commit | ecaaf0462d6c70cabfcaf6868a526e5415505e2c (patch) | |
| tree | 55006c376ca0ab96799b2d5da619280626211b40 /hw/xquartz/X11Application.m | |
| parent | ea94995982d1cc585768d52fec75cae018457fa5 (diff) | |
XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
Also some prefix related fixes.
(cherry picked from commit fd459e96581a883e30323c840b71004aa0747169)
Diffstat (limited to 'hw/xquartz/X11Application.m')
| -rw-r--r-- | hw/xquartz/X11Application.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m index 21013d90d..371b6d69d 100644 --- a/hw/xquartz/X11Application.m +++ b/hw/xquartz/X11Application.m @@ -54,7 +54,7 @@ // pbproxy/pbproxy.h extern BOOL xpbproxy_init (void); -#define DEFAULTS_FILE "/usr/X11/lib/X11/xserver/Xquartz.plist" +#define DEFAULTS_FILE X11LIBDIR"/X11/xserver/Xquartz.plist" #ifndef XSERVER_VERSION #define XSERVER_VERSION "?" |