Track changes in Cairo 0.1.1

diff --git a/ChangeLog b/ChangeLog
index 6100bf0a654213bb45fb29f3c63222acabb5e5eb..cac1149a7dc31260848cee5b5a1fbed03727431c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-04  Carl Worth  <cworth@isi.edu>
+
+       * configure.in (PKG_CHECK_MODULES): Require Cairo 0.1.1 or newer.
+
+       * src/grr_icon.c (grr_icon_predraw): Track changes in Cairo 0.1.1
+
 2003-07-11  Carl Worth  <cworth@isi.edu>
 
        * src/grrobot.c (grr_game_read_notices): Compressed move display

diff --git a/configure.in b/configure.in
index d7d827cfbe22db0d858a4a1e95e3a7879af2688e..0983fd71810ac1420cd7cd8cee049e561a0b0549 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_STDC_HEADERS
 
 dnl ===========================================================================
 
-PKG_CHECK_MODULES(GRROBOT, gtk+-2.0 libxsvg librr)
+PKG_CHECK_MODULES(GRROBOT, gtk+-2.0 libxsvg librr cairo >= 0.1.1)
 AC_SUBST(GRROBOT_CFLAGS)
 AC_SUBST(GRROBOT_LIBS)
 

diff --git a/src/grr_icon.c b/src/grr_icon.c
index d34ab4b3d489fc2fefefee40c9cd1775f4f087e5..f4515fe581deb04ce6ebcf96cbb61440fc5c024c 100644 (file)
--- a/src/grr_icon.c
+++ b/src/grr_icon.c
@@ -242,7 +242,7 @@ grr_icon_predraw (grr_icon_t *icon, cairo_t *xrs, int width, int height)
            cairo_surface_destroy (icon->surface);
        icon->surface_width = width;
        icon->surface_height = height;
-       icon->surface = cairo_surface_create_similar (cairo_get_target_surface (xrs),
+       icon->surface = cairo_surface_create_similar (cairo_current_target_surface (xrs),
                                                      CAIRO_FORMAT_ARGB32,
                                                      width, height);
     }