xserver: Branch 'master' - 2 commits

[Keith Packard]

 configure.ac   |    4 ++--
 dix/colormap.c |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 15b30fde179cba3877182cd51b0f870ef29ffaee
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 22 17:29:01 2009 -0400

    dix: Fix up colormap fixup.
    
    FindClientResourcesByType() will walk all colormaps on all screens; we
    only want to fix up the current screen.  Otherwise, screens > 0 will
    have the visual pointers for their colormaps pointing off into space.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/dix/colormap.c b/dix/colormap.c
index d702b02..bf97941 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -2705,6 +2705,9 @@ static void _colormap_find_resource(pointer value, XID id,
     ColormapPtr cmap = value;
     int j;
 
+    if (pScreen != cmap->pScreen)
+	return;
+
     j = cmap->pVisual - pScreen->visuals;
     cmap->pVisual = &visuals[j];
 }
commit 3785475a78636eb6547ef9e46be9e009c7cf7800
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Oct 23 09:03:39 2009 +0900

    Bump to 1.7.99.2 (unreleased)

diff --git a/configure.ac b/configure.ac
index 463b710..d85b8eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.7.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
-RELEASE_DATE="2009-10-22)"
+AC_INIT([xorg-server], 1.7.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="(unreleased)"
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE