diff -ru nautilus-2.20.0.orig/configure.in nautilus-2.20.0/configure.in --- nautilus-2.20.0.orig/configure.in 2007-09-18 02:55:14.000000000 -0400 +++ nautilus-2.20.0/configure.in 2008-01-15 18:55:50.669640015 -0500 @@ -22,6 +22,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. @@ -266,6 +267,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) diff -ru nautilus-2.20.0.orig/src/nautilus-image-properties-page.c nautilus-2.20.0/src/nautilus-image-properties-page.c --- nautilus-2.20.0.orig/src/nautilus-image-properties-page.c 2007-07-24 05:56:20.000000000 -0400 +++ nautilus-2.20.0/src/nautilus-image-properties-page.c 2008-01-15 19:02:48.409911118 -0500 @@ -266,7 +266,11 @@ { uint32_t options; XmpStringPtr 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, "%s: %s\n", descr, xmp_string_cstr(value)); }