Index: gfx/cairo/cairo/src/cairo-xlib-surface.c
===================================================================
RCS file: /cvsroot/mozilla/gfx/cairo/cairo/src/cairo-xlib-surface.c,v
retrieving revision 1.11
diff -u -8 -p -r1.11 cairo-xlib-surface.c
--- gfx/cairo/cairo/src/cairo-xlib-surface.c	28 Mar 2006 02:29:07 -0000	1.11
+++ gfx/cairo/cairo/src/cairo-xlib-surface.c	17 May 2006 18:52:03 -0000
@@ -2616,20 +2616,18 @@ _cairo_xlib_surface_show_glyphs (void   
 	if (glyphs[i].index > max_index)
 	    max_index = glyphs[i].index;
 	status = _cairo_scaled_glyph_lookup (scaled_font,
 					     glyphs[i].index,
 					     CAIRO_SCALED_GLYPH_INFO_SURFACE,
 					     &scaled_glyph);
 	if (status != CAIRO_STATUS_SUCCESS)
 	    return status;
-	if (scaled_glyph->surface_private == NULL) {
+	if (scaled_glyph->surface_private == NULL)
 	    _cairo_xlib_surface_add_glyph (dst->dpy, scaled_font, scaled_glyph);
-	    scaled_glyph->surface_private = (void *) 1;
-	}
     }
 
     _cairo_xlib_surface_ensure_dst_picture (dst);
 
     max_chunk_size = XMaxRequestSize (dst->dpy);
     if (max_index < 256) {
 	max_chunk_size -= sz_xRenderCompositeGlyphs8Req;
 	show_glyphs_func = _cairo_xlib_surface_show_glyphs8;