xserver: Branch 'master'

[Alan Coopersmith]

 hw/dmx/dmxscrinit.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b159a98f7fbdb3f8b337cd1bfd2ff27312856619
Author: Lee Leahu <freedesktop-bugs at dyweni.com>
Date:   Thu Oct 23 21:03:57 2008 -0500

    seg fault when initializing DMX screens
    
    X.Org Bugzilla #18086: http://bugs.freedesktop.org/show_bug.cgi?id=18086
    Patch #19837: http://bugs.freedesktop.org/attachment.cgi?id=19837

diff --git a/hw/dmx/dmxscrinit.c b/hw/dmx/dmxscrinit.c
index 7360750..b5afb58 100644
--- a/hw/dmx/dmxscrinit.c
+++ b/hw/dmx/dmxscrinit.c
@@ -68,7 +68,7 @@ static unsigned long dmxGeneration;
 static unsigned long *dmxCursorGeneration;
 
 static int dmxGCPrivateKeyIndex;
-DevPrivateKey dmxGCPrivateKey = &dmxGCPrivateKey; /**< Private index for GCs       */
+DevPrivateKey dmxGCPrivateKey = &dmxGCPrivateKeyIndex; /**< Private index for GCs       */
 static int dmxWinPrivateKeyIndex;
 DevPrivateKey dmxWinPrivateKey = &dmxWinPrivateKeyIndex; /**< Private index for Windows   */
 static int dmxPixPrivateKeyIndex;