xserver: Branch 'master'

[Keith Packard]

 dix/dispatch.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ff82f724e4ed24d73f15fa9c35a1d0c2c7d8cef7
Author: Colin Harrison <colin.harrison at virgin.net>
Date:   Wed Oct 13 10:20:06 2010 -0700

    Comparison between pointer and integer in latest dix/dispatch.c
    
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/dispatch.c b/dix/dispatch.c
index 35e7ddd..b66861f 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -916,7 +916,7 @@ GetGeometry(ClientPtr client, xGetGeometryReply *rep)
     rep->width = pDraw->width;
     rep->height = pDraw->height;
 
-    if (WindowDrawable(pDraw))
+    if (WindowDrawable(pDraw->type))
     {
         WindowPtr pWin = (WindowPtr)pDraw;
 	rep->x = pWin->origin.x - wBorderWidth (pWin);