pixman: Branch 'master'

[Søren Sandmann Pedersen]

 pixman/pixman-implementation.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 8d523bd9f3eb44b9e9a3c64f153626c39a0fffdc
Author: Søren Sandmann Pedersen <sandmann at redhat.com>
Date:   Tue Jun 2 07:47:29 2009 -0400

    Make sure the whole delegate chain has the correct toplevel

diff --git a/pixman/pixman-implementation.c b/pixman/pixman-implementation.c
index 86c2f37..e57b3d9 100644
--- a/pixman/pixman-implementation.c
+++ b/pixman/pixman-implementation.c
@@ -136,6 +136,7 @@ _pixman_implementation_create (pixman_implementation_t *toplevel,
 			       pixman_implementation_t *delegate)
 {
     pixman_implementation_t *imp = malloc (sizeof (pixman_implementation_t));
+    pixman_implementation_t *d;
     int i;
     
     if (!imp)
@@ -145,9 +146,10 @@ _pixman_implementation_create (pixman_implementation_t *toplevel,
 	imp->toplevel = toplevel;
     else
 	imp->toplevel = imp;
-    
-    if (delegate)
-	delegate->toplevel = imp->toplevel;
+
+    /* Make sure the whole delegate chain has the right toplevel */
+    for (d = delegate; d != NULL; d = d->delegate)
+	d->toplevel = imp->toplevel;
     
     imp->delegate = delegate;