xserver: Branch 'master'

[Daniel Stone]

 dix/window.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree a1ac0440bba690368aa4226468ce571be1a09d95 (from 19f673b7788d32c220e7e06734f1074b0e4a999c)
Author: Daniel Stone <daniel at fooishbar.org>
Date:   Fri Aug 18 17:30:00 2006 +0300

    dix: fix whiteroot thinko
    Note to self: run git update-index _after_ testing, not just before.

diff --git a/dix/window.c b/dix/window.c
index c16f514..0beeb3a 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -519,9 +519,9 @@ InitRootWindow(WindowPtr pWin)
     }
     else {
         if (blackRoot)
-            pWin->background.pixel = blackPixel;
+            pWin->background.pixel = pScreen->blackPixel;
         else
-            pWin->background.pixel = whitePixel;
+            pWin->background.pixel = pScreen->whitePixel;
         backFlag |= CWBackPixel;
     }