744bff
--- xorg-server-1.3.0.0/randr/rrxinerama.c.jx	2007-05-17 17:07:31.000000000 -0400
744bff
+++ xorg-server-1.3.0.0/randr/rrxinerama.c	2007-05-31 21:41:13.000000000 -0400
744bff
@@ -147,12 +147,6 @@
744bff
 }
744bff
 
744bff
 static Bool
744bff
-RRXineramaScreenActive (ScreenPtr pScreen)
744bff
-{
744bff
-    return rrGetScrPriv(pScreen) != NULL;
744bff
-}
744bff
-
744bff
-static Bool
744bff
 RRXineramaCrtcActive (RRCrtcPtr crtc)
744bff
 {
744bff
     return crtc->mode != NULL && crtc->numOutputs > 0;
744bff
@@ -164,7 +158,7 @@
744bff
     int	i, n;
744bff
     
744bff
     n = 0;
744bff
-    if (RRXineramaScreenActive (pScreen))
744bff
+    if (rrGetScrPriv (pScreen))
744bff
     {
744bff
 	rrScrPriv(pScreen);
744bff
 	for (i = 0; i < pScrPriv->numCrtcs; i++)
744bff
@@ -174,6 +168,12 @@
744bff
     return n;
744bff
 }
744bff
 
744bff
+static Bool
744bff
+RRXineramaScreenActive (ScreenPtr pScreen)
744bff
+{
744bff
+    return RRXineramaScreenCount (pScreen) > 0;
744bff
+}
744bff
+
744bff
 int
744bff
 ProcRRXineramaGetScreenCount(ClientPtr client)
744bff
 {