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

[Jeremy Huddleston]

 hw/darwin/apple/bundle-main.c |    2 +-
 hw/darwin/apple/server-main.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c3c71a882f8c60435718c83d353890e3cd5812db
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Mon Dec 3 19:28:32 2007 -0800

    Darwin: Always set DISPLAY
    We weren't setting $DISPLAY when we should be...

diff --git a/hw/darwin/apple/bundle-main.c b/hw/darwin/apple/bundle-main.c
index 26bd436..c436d51 100644
--- a/hw/darwin/apple/bundle-main.c
+++ b/hw/darwin/apple/bundle-main.c
@@ -46,7 +46,7 @@ int main(int argc, char **argv) {
     }
     
     /* First check if launchd started us */
-    if(strncmp(argv[1], "--launchd", 9) == 0) {
+    if(argc == 2 && !strncmp(argv[1], "--launchd", 9)) {
         argc--;
         argv[1] = argv[0];
         argv++;
diff --git a/hw/darwin/apple/server-main.c b/hw/darwin/apple/server-main.c
index 7ee450e..26fcbb0 100644
--- a/hw/darwin/apple/server-main.c
+++ b/hw/darwin/apple/server-main.c
@@ -512,7 +512,7 @@ start_client (void)
 	case 0:					/* child */
 		/* Setup environment */
 		temp = getenv("DISPLAY");
-		if (temp != NULL && temp[0] != 0)
+//		if (temp == NULL && temp[0] != 0)
 			setenv("DISPLAY", server_name, TRUE);
 
 		temp = getenv("PATH");