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

[Jeremy Huddleston]

 hw/xquartz/quartz.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 346b25f88f6ab74dbef0559c9634d72463e017f5
Author: Jeremy Huddleston <jeremy at yuffie.local>
Date:   Sun Feb 22 00:39:41 2009 -0800

    XQuartz: DefineInitialRootWindow is gone

diff --git a/hw/xquartz/quartz.c b/hw/xquartz/quartz.c
index 1274ec7..6d29abc 100644
--- a/hw/xquartz/quartz.c
+++ b/hw/xquartz/quartz.c
@@ -284,7 +284,9 @@ static void QuartzUpdateScreens(void) {
     pScreen->ResizeWindow(pRoot, x - sx, y - sy, width, height, NULL);
     //pScreen->PaintWindowBackground (pRoot, &pRoot->borderClip,  PW_BACKGROUND);
     miPaintWindow(pRoot, &pRoot->borderClip,  PW_BACKGROUND);
-    DefineInitialRootWindow(pRoot);
+
+//  TODO: This is a noop in 1.6 and nuked in master... we may need to do something else now to handle it
+//    DefineInitialRootWindow(pRoot);
 
     DEBUG_LOG("Root Window: %dx%d @ (%d, %d) darwinMainScreen (%d, %d) xy (%d, %d) dixScreenOrigins (%d, %d)\n", width, height, x - sx, y - sy, darwinMainScreenX, darwinMainScreenY, x, y, dixScreenOrigins[pScreen->myNum].x, dixScreenOrigins[pScreen->myNum].y);