conditionalize deprecated functions

diff --git a/configure.ac b/configure.ac
index d5eba29093b820c2bd5a288e1b6c1a2d4745f87d..e677f92daeca31bdcbe17a19a08d93c766275f31 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2231,7 +2231,7 @@ if test "x$use_pangocairo" = "xYes"; then
     save_LIBS=$LIBS
     PKG_CHECK_MODULES(PANGOFT2, [pangoft2])
     LIBS="$LIBS $PANGOCAIRO_LIBS $PANGOFT2_LIBS"
-    AC_CHECK_FUNCS([pango_fc_font_lock_face pango_fc_font_unlock_face])
+    AC_CHECK_FUNCS([pango_fc_font_lock_face pango_fc_font_unlock_face pango_font_map_create_context])
     LIBS=$save_LIBS
 fi
 
@@ -2391,6 +2391,10 @@ else
       [Define if you have the gdk library])
     AC_SUBST([GDK_CFLAGS])
     AC_SUBST([GDK_LIBS])
+    save_LIBS=$LIBS
+    LIBS="$LIBS $GDK_LIBS"
+    AC_CHECK_FUNCS([g_object_unref])
+    LIBS=$save_LIBS
   ],[
     use_gdk_pixbuf="No (gdk library not available)"
   ])

diff --git a/plugin/gdk/gvdevice_gdk.c b/plugin/gdk/gvdevice_gdk.c
index 475d1a11f47dd2f87df763bd4b0b7dcf66026cc4..77f803c79ebb502f72592bc7d3af834270358b44 100644 (file)
--- a/plugin/gdk/gvdevice_gdk.c
+++ b/plugin/gdk/gvdevice_gdk.c
@@ -105,7 +105,11 @@ static void gdk_format(GVJ_t * job)
 
     gdk_pixbuf_save_to_callback(pixbuf, writer, job, format_str, NULL, NULL);
 
+#if HAVE_G_OBJECT_UNREF 
     g_object_unref(pixbuf);
+#else
+    gdk_pixbuf_unref(pixbuf);
+#endif
 }
 
 static gvdevice_engine_t gdk_engine = {

diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c
index 8ae09b39bce9299a0eccbe3c73ba157cd73ea36a..9227718d2174518ca6ae35b5355f1937e07e27d0 100644 (file)
--- a/plugin/pango/gvtextlayout_pango.c
+++ b/plugin/pango/gvtextlayout_pango.c
@@ -88,7 +88,11 @@ static boolean pango_textlayout(textspan_t * span, char **fontpath)
     if (!context) {
        fontmap = pango_cairo_font_map_new();
        gv_fmap = get_font_mapping(fontmap);
+#ifdef HAVE_PANGO_FONT_MAP_CREATE_CONTEXT
        context = pango_font_map_create_context (fontmap);
+#else
+       context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP(fontmap));
+#endif
        options=cairo_font_options_create();
        cairo_font_options_set_antialias(options,CAIRO_ANTIALIAS_GRAY);
        cairo_font_options_set_hint_style(options,CAIRO_HINT_STYLE_FULL);