comparison src/filedata.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 c5c7e19fbb23
children 192d4752fd06
comparison
equal deleted inserted replaced
1685:47b191b77e07 1686:59c72fd324ce
1947 /* write private metadata file under ~/.geeqie */ 1947 /* write private metadata file under ~/.geeqie */
1948 1948
1949 /* If an existing metadata file exists, we will try writing to 1949 /* If an existing metadata file exists, we will try writing to
1950 * it's location regardless of the user's preference. 1950 * it's location regardless of the user's preference.
1951 */ 1951 */
1952 gchar *metadata_path = cache_find_location(CACHE_TYPE_XMP_METADATA, fd->path); 1952 gchar *metadata_path = NULL;
1953 #ifdef HAVE_EXIV2
1954 /* but ignore XMP if we are not able to write it */
1955 metadata_path = cache_find_location(CACHE_TYPE_XMP_METADATA, fd->path);
1956 #endif
1953 if (!metadata_path) metadata_path = cache_find_location(CACHE_TYPE_METADATA, fd->path); 1957 if (!metadata_path) metadata_path = cache_find_location(CACHE_TYPE_METADATA, fd->path);
1954 1958
1955 if (metadata_path && !access_file(metadata_path, W_OK)) 1959 if (metadata_path && !access_file(metadata_path, W_OK))
1956 { 1960 {
1957 g_free(metadata_path); 1961 g_free(metadata_path);