xserver: Branch 'xgl-0-0-1'

[David Reveman]

 hw/xgl/glx/xglx.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

New commits:
diff-tree 334b63e496b9ae09d3c52b935fb318c1a4e22c92 (from 1978343ef4094919643d4e0a3d910dac01805ecb)
Author: David Reveman <davidr at novell.com>
Date:   Wed Sep 27 08:49:52 2006 -0400

    Set correct reply length when xinerama isn't active.

diff --git a/hw/xgl/glx/xglx.c b/hw/xgl/glx/xglx.c
index 7f65658..76766e4 100644
--- a/hw/xgl/glx/xglx.c
+++ b/hw/xgl/glx/xglx.c
@@ -591,8 +591,17 @@ xglxProcXineramaQueryScreens (ClientPtr 
 
     rep.type	       = X_Reply;
     rep.sequenceNumber = client->sequence;
-    rep.number	       = n;
-    rep.length	       = n * sz_XineramaScreenInfo >> 2;
+
+    if (info)
+    {
+	rep.number = n;
+	rep.length = n * sz_XineramaScreenInfo >> 2;
+    }
+    else
+    {
+	rep.number = 0;
+	rep.length = 0;
+    }
 
     if (client->swapped)
     {