Attachment #141016 for bug #206041

Lines 22-27 Link Here

(-)nautilus-2.20.0.orig/configure.in (+4 lines)
22	m4_define(beagle_minver, 0.0.12)	22	m4_define(beagle_minver, 0.0.12)
23	m4_define(tracker_minver, 0.0.1)	23	m4_define(tracker_minver, 0.0.1)
24	m4_define(exempi_minver, 1.99.2)	24	m4_define(exempi_minver, 1.99.2)
		25	m4_define(exempi_minver_newapi, 1.99.5)
25		26
26	dnl 1. If the library code has changed at all since last release, then increment revision.	27	dnl 1. If the library code has changed at all since last release, then increment revision.
27	dnl 2. If any interfaces have been added, then increment current and set revision to 0.	28	dnl 2. If any interfaces have been added, then increment current and set revision to 0.
Lines 266-271 Link Here
266	AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable XMP support])	267	AC_DEFINE(HAVE_EXEMPI, 1, [Define to enable XMP support])
267	], [AM_CONDITIONAL(HAVE_EXEMPI, false)])	268	], [AM_CONDITIONAL(HAVE_EXEMPI, false)])
268		269
		270	PKG_CHECK_MODULES(EXEMPI_NEW_API, exempi-2.0 >= exempi_minver_newapi,
		271	AC_DEFINE(HAVE_EXEMPI_NEW_API, 1, [Define if we have exempi with the new API]), true)
		272
269	AC_SUBST(EXEMPI_CFLAGS)	273	AC_SUBST(EXEMPI_CFLAGS)
270	AC_SUBST(EXEMPI_LIBS)	274	AC_SUBST(EXEMPI_LIBS)
271		275

Lines 266-272 Link Here

(-)nautilus-2.20.0.orig/src/nautilus-image-properties-page.c (+4 lines)
266	{	266	{
267	uint32_t options;	267	uint32_t options;
268	XmpStringPtr value = xmp_string_new();	268	XmpStringPtr value = xmp_string_new();
		269	#ifdef HAVE_EXEMPI_NEW_API
		270	if (xmp_get_property (xmp, ns, propname, value, &options)) {
		271	#else
269	if(xmp_get_property_and_bits(xmp, ns, propname, value, &options)) {	272	if(xmp_get_property_and_bits(xmp, ns, propname, value, &options)) {
		273	#endif
270	if(XMP_IS_PROP_SIMPLE(options)) {	274	if(XMP_IS_PROP_SIMPLE(options)) {
271	g_string_append_printf(string, "<b>%s:</b> %s\n", descr, xmp_string_cstr(value));	275	g_string_append_printf(string, "<b>%s:</b> %s\n", descr, xmp_string_cstr(value));
272	}	276	}

Return to bug 206041