[cairo-commit] boilerplate/cairo-boilerplate.c boilerplate/cairo-boilerplate.h perf/cairo-perf.c

[Carl Worth]

 boilerplate/cairo-boilerplate.c |    6 +++---
 boilerplate/cairo-boilerplate.h |    2 +-
 perf/cairo-perf.c               |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
diff-tree 71037f3612da9d11431567c05c17807499ab1746 (from 6c9508340620c5981393a3455304e774712ddc83)
Author: Carl Worth <cworth at cworth.org>
Date:   Mon Oct 16 09:07:40 2006 -0700

    Rename wait_for_rendering to syncrhonize
    
    We're not using this call both before and after rendering
    so the old name just didn't make sense anymore.

diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c
index 1af6e89..0320816 100644
--- a/boilerplate/cairo-boilerplate.c
+++ b/boilerplate/cairo-boilerplate.c
@@ -865,7 +865,7 @@ typedef struct _xlib_target_closure
 } xlib_target_closure_t;
 
 static void
-boilerplate_xlib_wait_for_rendering (void *closure)
+boilerplate_xlib_synchronize (void *closure)
 {
     xlib_target_closure_t *xtc = closure;
     XImage *ximage;
@@ -1443,10 +1443,10 @@ cairo_boilerplate_target_t targets[] =
 #if CAIRO_HAS_XLIB_SURFACE
     { "xlib", CAIRO_SURFACE_TYPE_XLIB, CAIRO_CONTENT_COLOR_ALPHA, 0,
       create_xlib_surface, cairo_surface_write_to_png, cleanup_xlib,
-      boilerplate_xlib_wait_for_rendering},
+      boilerplate_xlib_synchronize},
     { "xlib", CAIRO_SURFACE_TYPE_XLIB, CAIRO_CONTENT_COLOR, 0,
       create_xlib_surface, cairo_surface_write_to_png, cleanup_xlib,
-      boilerplate_xlib_wait_for_rendering},
+      boilerplate_xlib_synchronize},
 #endif
 #if CAIRO_HAS_PS_SURFACE
     { "ps", CAIRO_SURFACE_TYPE_PS,
diff --git a/boilerplate/cairo-boilerplate.h b/boilerplate/cairo-boilerplate.h
index 26f4bec..66d40e5 100644
--- a/boilerplate/cairo-boilerplate.h
+++ b/boilerplate/cairo-boilerplate.h
@@ -119,7 +119,7 @@ typedef struct _cairo_boilerplate_target
     cairo_boilerplate_create_surface_t	create_surface;
     cairo_boilerplate_write_to_png_t	write_to_png;
     cairo_boilerplate_cleanup_t		cleanup;
-    cairo_boilerplate_wait_t		wait_for_rendering;
+    cairo_boilerplate_wait_t		synchronize;
     void			       *closure;
 } cairo_boilerplate_target_t;
 
diff --git a/perf/cairo-perf.c b/perf/cairo-perf.c
index 3af389b..be8a71e 100644
--- a/perf/cairo-perf.c
+++ b/perf/cairo-perf.c
@@ -226,7 +226,7 @@ main (int argc, char *argv[])
 						    perf.size, perf.size,
 						    CAIRO_BOILERPLATE_MODE_PERF,
 						    &target->closure);
-		cairo_perf_timer_set_synchronize (target->wait_for_rendering,
+		cairo_perf_timer_set_synchronize (target->synchronize,
 						  target->closure);
 
 		perf.cr = cairo_create (surface);