All pastes #765700 Raw Edit

Vermischtes

public text v1 · immutable
·published 2007-11-08 08:15 UTC
rendered paste body
Index: src/nautilus-image-properties-page.c
===================================================================
--- src/nautilus-image-properties-page.c        (Revision 13409)
+++ src/nautilus-image-properties-page.c        (Arbeitskopie)
@@ -265,7 +265,11 @@
        XmpStringPtr value;
 
        value = xmp_string_new();
+#ifdef HAVE_EXEMPI_NEW_API
+       if (xmp_get_property (xmp, ns, propname, value, &options)) {
+#else
        if (xmp_get_property_and_bits (xmp, ns, propname, value, &options)) {
+#endif
                if (XMP_IS_PROP_SIMPLE (options)) {
                        g_string_append_printf (string,
                                                "<b>%s:</b> %s\n",
Index: configure.in
===================================================================
--- configure.in        (Revision 13409)
+++ configure.in        (Arbeitskopie)
@@ -21,6 +21,7 @@
 m4_define(beagle_minver,               0.0.12)
 m4_define(tracker_minver,              0.0.1)
 m4_define(exempi_minver,               1.99.2)
+m4_define(exempi_minver_newapi,        1.99.5)
 
 dnl 1. If the library code has changed at all since last release, then increment revision.
 dnl 2. If any interfaces have been added, then increment current and set revision to 0.
@@ -264,6 +265,9 @@
                  AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable XMP support])
                  ], [AM_CONDITIONAL(HAVE_EXEMPI, false)])
 
+PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi,
+                 AC_DEFINE(HAVE_EXEMPI_NEW_API, 1, [Define if we have exempi with the new API]), true)
+
 AC_SUBST(EXEMPI_CFLAGS)
 AC_SUBST(EXEMPI_LIBS)