From b2135e589baeb2ea26da50b9167feaea23bcce3c Mon Sep 17 00:00:00 2001
From: Kevin E Martin <kem@kem.org>
Date: Fri, 3 Sep 2004 16:18:23 +0000
Subject: [PATCH] First set of documentation updates. Include more correct fix
 for rootless interaction with damage (Bug #1168,     Keith Packard).

---
 miext/damage/damage.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index f87adb7a5..963780f70 100755
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -78,16 +78,12 @@ getDrawableDamageRef (DrawablePtr pDrawable)
     {
 	ScreenPtr   pScreen = pDrawable->pScreen;
 
-#ifdef ROOTLESS_WORKAROUND
-	if (!((WindowPtr)pDrawable)->viewable)
-	{
-	    static DamagePtr nullDamage = 0;
-	    return &nullDamage;
-	}
-#endif
-
 	pPixmap = 0;
-	if (pScreen->GetWindowPixmap)
+	if (pScreen->GetWindowPixmap
+#ifdef ROOTLESS_WORKAROUND
+	    && ((WindowPtr)pDrawable)->viewable
+#endif
+	    )
 	    pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable);
 
 	if (!pPixmap)