xserver: Branch 'xorg-server-1.4-apple' - 3 commits

[Jeremy Huddleston]

 hw/xquartz/X11Application.m   |   21 ++++++++++++---------
 hw/xquartz/bundle/Makefile.am |    2 ++
 hw/xquartz/darwin.c           |    1 -
 3 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit e39613f4633ed992bc276b70833a703560e528f9
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon May 12 17:57:07 2008 -0700

    Added missing to EXTRA_DIST

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index a8f45f8..89d04c7 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -6,6 +6,8 @@ resource_DATA = Xquartz.plist
 
 EXTRA_DIST = \
 	mk_bundke.sh \
+	Info.plist \
+	PkgInfo \
 	$(resource_DATA) \
 	Resources/da.lproj/InfoPlist.strings \
 	Resources/da.lproj/Localizable.strings \
commit 0279a5970694937e949ba533330ea48961c4edba
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon May 12 13:36:35 2008 -0700

    XQuartz: Cleaned up the about box.

diff --git a/hw/xquartz/X11Application.m b/hw/xquartz/X11Application.m
index 3be41db..36b73cd 100644
--- a/hw/xquartz/X11Application.m
+++ b/hw/xquartz/X11Application.m
@@ -143,18 +143,21 @@ static void message_kit_thread (SEL selector, NSObject *arg) {
     NSMutableDictionary *dict;
     NSDictionary *infoDict;
     NSString *tem;
-	
-    dict = [NSMutableDictionary dictionaryWithCapacity:2];
+    
+    dict = [NSMutableDictionary dictionaryWithCapacity:3];
     infoDict = [[NSBundle mainBundle] infoDictionary];
-	
+    
     [dict setObject: NSLocalizedString (@"The X Window System", @"About panel")
-			 forKey:@"ApplicationName"];
-	
+          forKey:@"ApplicationName"];
+    
     tem = [infoDict objectForKey:@"CFBundleShortVersionString"];
-	
-    [dict setObject:[NSString stringWithFormat:@"XQuartz %@ - (xorg-server %s)", tem, XSERVER_VERSION]
-	  forKey:@"ApplicationVersion"];
-	
+    
+    [dict setObject:[NSString stringWithFormat:@"XQuartz %@", tem]
+          forKey:@"ApplicationVersion"];
+
+    [dict setObject:[NSString stringWithFormat:@"xorg-server %s", XSERVER_VERSION]
+          forKey:@"Version"];
+    
     [self orderFrontStandardAboutPanelWithOptions: dict];
 }
 
commit fe2279440450c795d67ba5a2234b0797d0bfe39c
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Mon May 12 11:34:06 2008 -0700

    Don't need the fink-friendly printf in the DDX anymore.

diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c
index 9f6923c..d1e3b6f 100644
--- a/hw/xquartz/darwin.c
+++ b/hw/xquartz/darwin.c
@@ -153,7 +153,6 @@ DarwinPrintBanner(void)
 { 
   // this should change depending on which specific server we are building
   ErrorF("Xquartz starting:\n");
-  ErrorF("X.org Release 7.2\n"); // This is here to help fink until they fix their packages.
   ErrorF("X.Org X Server %s\nBuild Date: %s\n", XSERVER_VERSION, BUILD_DATE );
 }