Use the same method of finding the screen pixmap of COMPOSITE extension is

    compiled in or not.
Removed stale make variable.
Updated xaaWrapper.c: Under certain circumstances the accel path was not
    used when possible. Removed some debugging stuff and stale code that
    had been commented out.
Check if maps are really installed before attempting to list them.

1 files changed, 5 insertions, 4 deletions

diff --git a/mi/micmap.c b/mi/micmap.c
index 45f8e1ed6..2018a093a 100644
--- a/mi/micmap.c
+++ b/mi/micmap.c
@@ -55,10 +55,11 @@ miInitVisualsProcPtr miInitVisualsProc = miDoInitVisuals;
 int
 miListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps)
 {
-    /* By the time we are processing requests, we can guarantee that there
-     * is always a colormap installed */
-    *pmaps = miInstalledMaps[pScreen->myNum]->mid;
-    return (1);
+    if (miInstalledMaps[pScreen->myNum]) {
+	*pmaps = miInstalledMaps[pScreen->myNum]->mid;
+	return (1);
+    }
+    return 0;
 }
 
 void