From de32d4dcf57c10fc100c1b33630127947a8c8460 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sun, 27 Feb 2011 15:49:10 -0800 Subject: Revert "rootless: Remove ROOTLESS_WORKAROUND" Christof Wolf has reported a regression that seems to be caused by this change, so reverting the change in the 1.9 branch. We'll investigate a proper fix in master for 1.10. This reverts commit c89f0521044083a11d538ebfeaabee6fc7fb9a03. Signed-off-by: Jeremy Huddleston --- miext/damage/damage.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'miext') diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 566995c41..0fe1fb603 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -89,7 +89,11 @@ getDrawableDamageRef (DrawablePtr pDrawable) ScreenPtr pScreen = pDrawable->pScreen; pPixmap = 0; - if (pScreen->GetWindowPixmap) + if (pScreen->GetWindowPixmap +#ifdef ROOTLESS_WORKAROUND + && ((WindowPtr)pDrawable)->viewable +#endif + ) pPixmap = (*pScreen->GetWindowPixmap) ((WindowPtr)pDrawable); if (!pPixmap) -- cgit v1.2.3