gthumb r2181 - in trunk: . libgthumb src

[mjc svn gnome org]

Author: mjc
Date: Fri Jan 11 18:21:06 2008
New Revision: 2181
URL: http://svn.gnome.org/viewvc/gthumb?rev=2181&view=rev

Log:
2008-01-11  Michael J. Chudobiak  <mjc svn gnome org>

        * libgthumb/gth-exif-utils.c: (gth_read_exiv2):
        * src/gth-exif-data-viewer.c: (update_metadata):
        Remove no-longer-used HAVE_EXIV2 ifdefs.



Modified:
   trunk/ChangeLog
   trunk/libgthumb/gth-exif-utils.c
   trunk/src/gth-exif-data-viewer.c

Modified: trunk/libgthumb/gth-exif-utils.c
==============================================================================
--- trunk/libgthumb/gth-exif-utils.c	(original)
+++ trunk/libgthumb/gth-exif-utils.c	Fri Jan 11 18:21:06 2008
@@ -778,7 +778,6 @@
 GList *
 gth_read_exiv2 (const char *uri, GList *metadata)
 {
-#ifdef HAVE_EXIV2
 	char *local_file;
 	char *uri_wo_ext;
         char *sidecar_uri;
@@ -809,7 +808,6 @@
 
 	/* Undo the initial reverse */
 	metadata = g_list_reverse (metadata);
-#endif
 
 	return metadata;
 }

Modified: trunk/src/gth-exif-data-viewer.c
==============================================================================
--- trunk/src/gth-exif-data-viewer.c	(original)
+++ trunk/src/gth-exif-data-viewer.c	Fri Jan 11 18:21:06 2008
@@ -797,10 +797,8 @@
 		return metadata;
 
 /* for now, use both exiv2 and libexif, until we're more comfortable with exiv2 */
-#ifdef HAVE_EXIV2
 	if ( mime_type_is_image (mime_type))
 		metadata = gth_read_exiv2 (uri, metadata);
-#endif
 
 	if ( mime_type_is (mime_type, "image/jpeg"))
 		metadata = gth_read_exif (uri, metadata, existing_edata);