xserver: Branch 'master'

[Adam Jackson]

 miext/damage/damage.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aab73d719a8de6b830e47c7f47860b7990ea8d03
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 23 13:20:59 2008 -0400

    Fix previous cherry pick for API changes

diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 471fcc5..fa2f279 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -771,7 +771,7 @@ damageAddTraps (PicturePtr  pPicture,
     }
     unwrap (pScrPriv, ps, AddTraps);
     (*ps->AddTraps) (pPicture, x_off, y_off, ntrap, traps);
-    damageReportPostOp (pPicture->pDrawable);
+    damageRegionProcessPending (pPicture->pDrawable);
     wrap (pScrPriv, ps, AddTraps, damageAddTraps);
 }
 #endif