xserver: Branch 'xorg-server-1.2-apple'

[Jeremy Huddleston]

 hw/xquartz/quartzStartup.c |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit a3067a084cfec7d3e67e772e8a2f4cd39b019942
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon Apr 28 15:54:23 2008 -0700

    XQuartz: Unset CFProcessPath... blech
    (cherry picked from commit ce4fbfbc75c62a092214d140c7550279aebe69ef)

diff --git a/hw/xquartz/quartzStartup.c b/hw/xquartz/quartzStartup.c
index 1b2a226..ab43734 100644
--- a/hw/xquartz/quartzStartup.c
+++ b/hw/xquartz/quartzStartup.c
@@ -70,6 +70,12 @@ void DarwinHandleGUI(int argc, char **argv, char **envp) {
     int         i;
     int         fd[2];
 
+    /* Unset CFProcessPath, so our children don't inherit this kludge we need
+     * to load our nib.  If an xterm gets this set, then it fails to
+     * 'open hi.txt' properly.
+     */
+    unsetenv("CFProcessPath");
+    
     if (been_here) {
         return;
     }