[Xquartz-changes] xserver: Branch 'server-1.4-apple'

[Jeremy Huddleston]

 hw/xquartz/GL/indirect.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0b4e0172fa90d72bd12863f52ecfac47a3be4e3b
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Wed Jul 28 21:49:23 2010 -0700

    XQuartz: GLX: Don't mangle __GLXDrawable's pDraw
    
    We were incorrectly NULLing out pDraw in __GLXDrawable instead of ours in
    __GLXAquaDrawable. (we should refactor to eliminate this redundancy later)
    
    This was causing http://xquartz.macosforge.org/trac/ticket/426
    This was benign until commit f0006aa58f6cf7552a239e169ff6e7e4fda532f4
    The root cause of this change was  fed7ccc481ad1caaa518cafe944c2327a5d0b6c65
    
    Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
    (cherry picked from commit 98f90145d786695ecbc02a667c6ffe7c619dc67e)
    
    Conflicts:
    
    	hw/xquartz/GL/indirect.c

diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
index add46fe..af7f99a 100644
--- a/hw/xquartz/GL/indirect.c
+++ b/hw/xquartz/GL/indirect.c
@@ -360,7 +360,7 @@ static void surface_notify(void *_arg, void *data) {
     case AppleDRISurfaceNotifyDestroyed:
         if (surface_hash != NULL)
             x_hash_table_remove(surface_hash, x_cvt_uint_to_vptr(arg->id));
-	        draw->base.pDraw = NULL;
+	        draw->pDraw = NULL;
 			draw->sid = 0;
         break;