[PATCH] dix: fix cursor screen check for xinerama setups.

[Peter Hutterer]

From: Tim Yamin <plasm at roo.me.uk>

The de-duplication of CheckPhysLimits 942eae6868b8b0f343b6a added a
condition that is invalid for a Xinerama setup. pScreen is invalid for the
Xinerama case, so comparing it to anything is a bad idea.

https://bugs.freedesktop.org/show_bug.cgi?id=24986

Signed-off-by: Tim Yamin <plasm at roo.me.uk>
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 dix/events.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 6541652..eaa2c57 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -738,7 +738,11 @@ CheckPhysLimits(
 	    new.y = pSprite->physLimits.y2 - 1;
     if (pSprite->hotShape)
 	ConfineToShape(pDev, pSprite->hotShape, &new.x, &new.y);
-    if ((pScreen != pSprite->hotPhys.pScreen) ||
+    if ((
+#ifdef PANORAMIX
+            noPanoramiXExtension &&
+#endif
+            (pScreen != pSprite->hotPhys.pScreen)) ||
 	(new.x != pSprite->hotPhys.x) || (new.y != pSprite->hotPhys.y))
     {
 #ifdef PANORAMIX
-- 
1.6.6.1