Mercurial > geeqie
diff src/metadata.c @ 1686:59c72fd324ce
fixes for a built without Exiv2
don't try to access XMP metadata if not compiled with Exiv2
some metadata options are valid without Exiv2, do not disable them
| author | nadvornik |
|---|---|
| date | Tue, 30 Jun 2009 20:12:28 +0000 |
| parents | 6a97ed4d2ba5 |
| children | 9fef1cbc556e |
line wrap: on
line diff
--- a/src/metadata.c Tue Jun 30 19:53:55 2009 +0000 +++ b/src/metadata.c Tue Jun 30 20:12:28 2009 +0000 @@ -457,6 +457,10 @@ g_free(metadata_pathl); g_free(metadata_path); } + +#ifdef HAVE_EXIV2 + /* without exiv2: do not delete xmp metadata because we are not able to convert it, + just ignore it */ metadata_path = cache_find_location(CACHE_TYPE_XMP_METADATA, fd->path); if (metadata_path && (!except || strcmp(metadata_path, except) != 0)) { @@ -465,6 +469,7 @@ g_free(metadata_pathl); g_free(metadata_path); } +#endif } static gboolean metadata_legacy_read(FileData *fd, GList **keywords, gchar **comment)