diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2010-10-27 17:59:35 +0200 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2010-10-30 16:29:15 +0200 |
| commit | 305d1b05896e39a5e3181247d9d4e837b4c35067 (patch) | |
| tree | 891194d4f60ab6af9f1d3476b652581720899bcc /src/nautilus-image-properties-page.c | |
| parent | 393df7a83c0a779784095a993db238867daeaa7a (diff) | |
| download | nautilus-305d1b05896e39a5e3181247d9d4e837b4c35067.tar.gz | |
image-properties-page: don't special-case old EXIF/XMP APIs
Diffstat (limited to 'src/nautilus-image-properties-page.c')
| -rw-r--r-- | src/nautilus-image-properties-page.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c index 69750a9f4..b38f9073b 100644 --- a/src/nautilus-image-properties-page.c +++ b/src/nautilus-image-properties-page.c @@ -184,20 +184,15 @@ static void exif_content_callback (ExifContent *content, gpointer data) { struct ExifAttribute *attribute; -#ifndef HAVE_OLD_EXIF char b[1024]; -#endif attribute = (struct ExifAttribute *)data; if (attribute->found) { return; } -#ifdef HAVE_OLD_EXIF - attribute->value = g_strdup (exif_content_get_value (content, attribute->tag)); -#else attribute->value = g_strdup (exif_content_get_value (content, attribute->tag, b, sizeof(b))); -#endif + if (attribute->value != NULL) { attribute->found = TRUE; } @@ -300,11 +295,7 @@ append_xmp_value_pair (NautilusImagePropertiesPage *page, 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)) { append_label_take_str (page->details->vbox, |