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

[Jeremy Huddleston]

 hw/xquartz/X11Controller.m |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 023cef31bbb2ab80a241098d82fcfd35ada75fc0
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Jul 24 09:16:37 2009 -0700

    XQuartz: Rever the "Set can_quit to true during a Sparkle-initiated relaunch." change
    
    This was in place to work around the issue that was correctly solved with the
    previous commit (changing the Windows menu behavior).  Reverting this change
    no longer causes crashing, so it's safe to show the dialog now.

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 4d46911..9477e94 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -343,7 +343,7 @@ BOOL xquartz_resetenv_display = NO;
 
 // Sent immediately before installing the specified update.
 - (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update {
-    [self set_can_quit:YES];
+    //[self set_can_quit:YES];
 }
 
 #endif