Index: libgthumb/gth-exif-utils.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/Attic/gth-exif-utils.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 gth-exif-utils.c
--- libgthumb/gth-exif-utils.c	6 Oct 2006 16:00:01 -0000	1.1.2.1
+++ libgthumb/gth-exif-utils.c	6 Oct 2006 19:26:51 -0000
@@ -22,8 +22,6 @@
 
 #include <config.h>
 
-#ifdef HAVE_LIBEXIF
-
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
@@ -268,12 +266,8 @@
 const char *
 get_exif_entry_value (ExifEntry *entry)
 {
-#ifdef HAVE_LIBEXIF_0_5
-	return exif_entry_get_value (entry);
-#else
 	char value[VALUE_LEN + 1];
 	return exif_entry_get_value (entry, value, VALUE_LEN);
-#endif
 }
 
 
@@ -343,5 +337,3 @@
 	exif_data_unref (edata);
 }
 
-
-#endif /* HAVE_LIBEXIF */
Index: libgthumb/gth-exif-utils.h
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/Attic/gth-exif-utils.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 gth-exif-utils.h
--- libgthumb/gth-exif-utils.h	6 Oct 2006 16:00:01 -0000	1.1.2.1
+++ libgthumb/gth-exif-utils.h	6 Oct 2006 19:26:51 -0000
@@ -26,8 +26,6 @@
 
 #include <config.h>
 
-#ifdef HAVE_LIBEXIF
-
 #include <libexif/exif-data.h>
 #include <libexif/exif-content.h>
 #include <libexif/exif-entry.h>
@@ -61,7 +59,5 @@
 				     ExifData   *edata);
 void        copy_exif_data          (const char *src,
 				     const char *dest);
-
-#endif /* HAVE_LIBEXIF */
 
 #endif /* EXIF_UTILS_H */
Index: libgthumb/image-loader.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/image-loader.c,v
retrieving revision 1.27.2.1
diff -u -r1.27.2.1 image-loader.c
--- libgthumb/image-loader.c	6 Oct 2006 16:00:01 -0000	1.27.2.1
+++ libgthumb/image-loader.c	6 Oct 2006 19:26:52 -0000
@@ -411,7 +411,6 @@
  * Returns an image, transformed according
  * to the Exif orientation data.
  */
-#ifdef HAVE_LIBEXIF 
 static GdkPixbuf *
 _gdk_pixbuf_transform_exif_orientation (GdkPixbuf* src, 
 				GthExifOrientation orientation)
@@ -458,7 +457,6 @@
 	
 	return dest;
 }
-#endif /* HAVE_LIBEXIF */
 
 static void 
 image_loader_sync_pixbuf (ImageLoader *il)
@@ -466,17 +464,13 @@
 	GdkPixbuf              *pixbuf;
 	GdkPixbuf              *temp;
 	ImageLoaderPrivateData *priv;
-#ifdef HAVE_LIBEXIF        
 	GthExifOrientation     orientation;
-#endif
   
 	g_return_if_fail (il != NULL);
      
 	priv = il->priv;
 
-#ifdef HAVE_LIBEXIF        
 	orientation = get_exif_tag_short (image_loader_get_path(il), EXIF_TAG_ORIENTATION);
-#endif
 
 	g_mutex_lock (priv->yes_or_no);
 
@@ -488,13 +482,8 @@
 		return;
 	}
 
-#ifdef HAVE_LIBEXIF
 	temp = gdk_pixbuf_animation_get_static_image (priv->animation);
 	pixbuf = _gdk_pixbuf_transform_exif_orientation (temp, orientation);
-#else
-	pixbuf = gdk_pixbuf_animation_get_static_image (priv->animation);
-	g_object_ref (pixbuf);
-#endif
 
 	if (priv->pixbuf == pixbuf) {
 		g_object_unref (pixbuf);
Index: libgthumb/jpeg-utils.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/jpeg-utils.c,v
retrieving revision 1.7
diff -u -r1.7 jpeg-utils.c
--- libgthumb/jpeg-utils.c	29 Dec 2005 18:26:37 -0000	1.7
+++ libgthumb/jpeg-utils.c	6 Oct 2006 19:26:53 -0000
@@ -28,8 +28,6 @@
 
 #include <config.h>
 
-#ifdef HAVE_LIBJPEG
-
 #include <setjmp.h>
 #include <stdio.h>
 #include <jpeglib.h>
@@ -319,5 +317,3 @@
 	do_load_internal (path, 0, 0, width_return, height_return);
 }
 
-
-#endif /* HAVE_LIBJPEG */
Index: libgthumb/jpeg-utils.h
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/jpeg-utils.h,v
retrieving revision 1.1
diff -u -r1.1 jpeg-utils.h
--- libgthumb/jpeg-utils.h	25 Dec 2003 19:23:43 -0000	1.1
+++ libgthumb/jpeg-utils.h	6 Oct 2006 19:26:53 -0000
@@ -29,8 +29,6 @@
 #ifndef JPEG_UTILS_H
 #define JPEG_UTILS_H
 
-#ifdef HAVE_LIBJPEG
-
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 GdkPixbuf *f_load_scaled_jpeg  (const char *path,
@@ -42,7 +40,5 @@
 void       f_get_jpeg_size     (const char *path,
 				int        *width_return,
 				int        *height_return);
-
-#endif /*  HAVE_LIBJPEG */
 
 #endif /* JPEG_UTILS_H */
Index: libgthumb/pixbuf-utils.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/pixbuf-utils.c,v
retrieving revision 1.17
diff -u -r1.17 pixbuf-utils.c
--- libgthumb/pixbuf-utils.c	18 Feb 2006 15:08:07 -0000	1.17
+++ libgthumb/pixbuf-utils.c	6 Oct 2006 19:26:53 -0000
@@ -81,11 +81,9 @@
 #include <tiffio.h>
 #endif /* HAVE_LIBTIFF */
 
-#ifdef HAVE_LIBJPEG
 #include <stdlib.h>
 #include <setjmp.h>
 #include <jpeglib.h>
-#endif /* HAVE_LIBJPEG */
 
 
 enum {
@@ -510,10 +508,6 @@
 }
 
 
-
-
-
-#ifdef HAVE_LIBJPEG
 
 /* error handler data */
 struct error_handler_data {
@@ -768,10 +762,6 @@
 	return TRUE;
 }
 
-#endif
-
-
-
 
 
 #ifdef HAVE_LIBTIFF
@@ -1266,14 +1256,12 @@
 						   error);
 	else
 #endif
-#ifdef HAVE_LIBJPEG
 	if (strcmp (type, "jpeg") == 0) 
 		result = _gdk_pixbuf_save_as_jpeg (pixbuf, 
 						   filename, 
 						   keys, values, 
 						   error);
 	else
-#endif
 	if ((strcmp (type, "x-tga") == 0) || (strcmp (type, "tga") == 0))
 		result = _gdk_pixbuf_save_as_tga (pixbuf, 
 						  filename, 
Index: libgthumb/thumb-loader.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/thumb-loader.c,v
retrieving revision 1.21
diff -u -r1.21 thumb-loader.c
--- libgthumb/thumb-loader.c	10 Jun 2006 13:58:26 -0000	1.21
+++ libgthumb/thumb-loader.c	6 Oct 2006 19:26:54 -0000
@@ -236,7 +236,6 @@
 {
 	GdkPixbufAnimation *animation = NULL;
 
-#ifdef HAVE_LIBJPEG
 	if (image_is_jpeg (path)) {
 		ThumbLoader *tl = data;
 		ThumbLoaderPrivateData *priv = tl->priv;
@@ -258,7 +257,6 @@
 			debug (DEBUG_INFO, "PIXBUF == NULL\n");
 
 	} else
-#endif
 		{
 			if (image_is_gif (path))
 				animation = gdk_pixbuf_animation_new_from_file (path, error);
Index: libgthumb/jpegutils/jpeg-data.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/jpegutils/Attic/jpeg-data.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 jpeg-data.c
--- libgthumb/jpegutils/jpeg-data.c	6 Oct 2006 16:00:02 -0000	1.1.2.1
+++ libgthumb/jpegutils/jpeg-data.c	6 Oct 2006 19:26:54 -0000
@@ -28,8 +28,6 @@
 
 /* #define DEBUG */
 
-#ifdef HAVE_LIBEXIF
-
 
 struct _JPEGDataPrivate
 {
@@ -477,5 +475,3 @@
 	section->content.generic.size = size;
 }
 
-
-#endif /* HAVE_LIBEXIF */
Index: libgthumb/jpegutils/jpeg-data.h
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/jpegutils/Attic/jpeg-data.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 jpeg-data.h
--- libgthumb/jpegutils/jpeg-data.h	6 Oct 2006 16:00:02 -0000	1.1.2.1
+++ libgthumb/jpegutils/jpeg-data.h	6 Oct 2006 19:26:54 -0000
@@ -21,8 +21,6 @@
 #ifndef __JPEG_DATA_H__
 #define __JPEG_DATA_H__
 
-#ifdef HAVE_LIBEXIF
-
 #include "jpeg-marker.h"
 #include <libexif/exif-data.h>
 
@@ -90,7 +88,5 @@
 void      jpeg_data_dump (JPEGData *data);
 
 void      jpeg_data_append_section (JPEGData *data);
-
-#endif /* HAVE_LIBEXIF */
 
 #endif /* __JPEG_DATA_H__ */
Index: libgthumb/jpegutils/jpegtran.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/jpegutils/Attic/jpegtran.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 jpegtran.c
--- libgthumb/jpegutils/jpegtran.c	6 Oct 2006 16:00:02 -0000	1.1.2.1
+++ libgthumb/jpegutils/jpegtran.c	6 Oct 2006 19:26:55 -0000
@@ -38,8 +38,6 @@
 
 #include <config.h>
 
-#ifdef HAVE_LIBJPEG
-
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -254,5 +252,3 @@
 }
 
 #endif /* TEST */
-
-#endif /* HAVE_LIBJPEG */
Index: libgthumb/jpegutils/jpegtran.h
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/jpegutils/Attic/jpegtran.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 jpegtran.h
--- libgthumb/jpegutils/jpegtran.h	6 Oct 2006 16:00:02 -0000	1.1.2.1
+++ libgthumb/jpegutils/jpegtran.h	6 Oct 2006 19:26:55 -0000
@@ -22,8 +22,6 @@
 
 #include <config.h>
 
-#ifdef HAVE_LIBJPEG
-
 #ifndef JPEGTRAN_H
 #define JPEGTRAN_H
 
@@ -37,5 +35,3 @@
 	       GError      **error);
 
 #endif /* JPEGTRAN_H */
-
-#endif /* HAVE_LIBJPEG */
Index: libgthumb/jpegutils/transupp.c
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/jpegutils/Attic/transupp.c,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 transupp.c
--- libgthumb/jpegutils/transupp.c	6 Oct 2006 16:00:02 -0000	1.1.2.1
+++ libgthumb/jpegutils/transupp.c	6 Oct 2006 19:26:55 -0000
@@ -39,8 +39,6 @@
 
 #include <config.h>
 
-#ifdef HAVE_LIBJPEG
-
 #define SAVE_MARKERS_SUPPORTED 1
 
 #include <stdio.h>
@@ -988,5 +986,3 @@
   }
 }
 
-
-#endif /* HAVE_LIBJPEG */
Index: libgthumb/jpegutils/transupp.h
===================================================================
RCS file: /cvs/gnome/gthumb/libgthumb/jpegutils/Attic/transupp.h,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 transupp.h
--- libgthumb/jpegutils/transupp.h	6 Oct 2006 16:00:02 -0000	1.1.2.1
+++ libgthumb/jpegutils/transupp.h	6 Oct 2006 19:26:56 -0000
@@ -45,8 +45,6 @@
  * Codes for supported types of image transformations.
  */
 
-#ifdef HAVE_LIBJPEG
-
 
 #ifndef TRANSUPP_H
 #define TRANSUPP_H
@@ -153,5 +151,3 @@
 
 
 #endif /* TRANSUPP_H */
-
-#endif /* HAVE_LIBJPEG */
Index: src/catalog-web-exporter.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/catalog-web-exporter.c,v
retrieving revision 1.38
diff -u -r1.38 catalog-web-exporter.c
--- src/catalog-web-exporter.c	30 Sep 2006 23:12:59 -0000	1.38
+++ src/catalog-web-exporter.c	6 Oct 2006 19:26:58 -0000
@@ -1339,65 +1339,52 @@
 		case GTH_TAG_EXIF_EXPOSURE_TIME:
 			idx = get_image_idx (tag, ce);
 			idata = g_list_nth (ce->file_list, idx)->data;
-#ifdef HAVE_LIBEXIF
 			line = get_exif_tag (idata->src_filename, 
 					     EXIF_TAG_EXPOSURE_TIME);
 			write_markup_escape_line (line, fout);
-#endif /* HAVE_LIBEXIF */
 			break;
 
 		case GTH_TAG_EXIF_EXPOSURE_MODE:
 			idx = get_image_idx (tag, ce);
 			idata = g_list_nth (ce->file_list, idx)->data;
-#ifdef HAVE_LIBEXIF
 			line = get_exif_tag (idata->src_filename, 
 					     EXIF_TAG_EXPOSURE_MODE);
 			write_markup_escape_line (line, fout);
-#endif /* HAVE_LIBEXIF */
 			break;
 
 		case GTH_TAG_EXIF_FLASH:
 			idx = get_image_idx (tag, ce);
 			idata = g_list_nth (ce->file_list, idx)->data;
-#ifdef HAVE_LIBEXIF
 			line = get_exif_tag (idata->src_filename, EXIF_TAG_FLASH);
 			write_markup_escape_line (line, fout);
-#endif /* HAVE_LIBEXIF */
 			break;
 
 		case GTH_TAG_EXIF_SHUTTER_SPEED:
 			idx = get_image_idx (tag, ce);
 			idata = g_list_nth (ce->file_list, idx)->data;
-#ifdef HAVE_LIBEXIF
 			line = get_exif_tag (idata->src_filename, 
 					     EXIF_TAG_SHUTTER_SPEED_VALUE);
 			write_markup_escape_line (line, fout);
-#endif /* HAVE_LIBEXIF */
 			break;
 
 		case GTH_TAG_EXIF_APERTURE_VALUE:
 			idx = get_image_idx (tag, ce);
 			idata = g_list_nth (ce->file_list, idx)->data;
-#ifdef HAVE_LIBEXIF
 			line = get_exif_aperture_value (idata->src_filename);
 			write_markup_escape_line (line, fout);
-#endif /* HAVE_LIBEXIF */
 			break;
 
 		case GTH_TAG_EXIF_FOCAL_LENGTH:
 			idx = get_image_idx (tag, ce);
 			idata = g_list_nth (ce->file_list, idx)->data;
-#ifdef HAVE_LIBEXIF
 			line = get_exif_tag (idata->src_filename, 
 					     EXIF_TAG_FOCAL_LENGTH);
 			write_markup_escape_line (line, fout);
-#endif /* HAVE_LIBEXIF */
 			break;
 
 		case GTH_TAG_EXIF_DATE_TIME:
 			idx = get_image_idx (tag, ce);
 			idata = g_list_nth (ce->file_list, idx)->data;
-#ifdef HAVE_LIBEXIF
 			{
 				time_t     t;
 				struct tm *tp;
@@ -1413,13 +1400,11 @@
 					write_line ("-", fout);
 
 			}
-#endif /* HAVE_LIBEXIF */
 			break;
 
 		case GTH_TAG_EXIF_CAMERA_MODEL:
 			idx = get_image_idx (tag, ce);
 			idata = g_list_nth (ce->file_list, idx)->data;
-#ifdef HAVE_LIBEXIF
 			line = get_exif_tag (idata->src_filename, 
 					     EXIF_TAG_MAKE);
 			write_markup_escape_line (line, fout);
@@ -1430,7 +1415,6 @@
 			line = get_exif_tag (idata->src_filename, 
 					     EXIF_TAG_MODEL);
 			write_markup_escape_line (line, fout);
-#endif /* HAVE_LIBEXIF */
 			break;
 
 		case GTH_TAG_SET_VAR:
@@ -1617,7 +1601,6 @@
 copy_exif_from_orig (const char *src_filename, 
 		     const char *dest_filename)
 {
-#if HAVE_LIBEXIF
 	JPEGData     *jdata_src, *jdata_dest;
 	ExifData     *edata_src;
 
@@ -1650,7 +1633,6 @@
 	exif_data_unref (edata_src);
 	jpeg_data_unref (jdata_src);
 	jpeg_data_unref (jdata_dest);
-#endif
 }
 
 
Index: src/dlg-change-date.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-change-date.c,v
retrieving revision 1.14
diff -u -r1.14 dlg-change-date.c
--- src/dlg-change-date.c	15 Aug 2005 13:08:19 -0000	1.14
+++ src/dlg-change-date.c	6 Oct 2006 19:26:58 -0000
@@ -75,8 +75,6 @@
 }
 
 
-#ifdef HAVE_LIBEXIF
-
 static gboolean
 exif_time_available (DialogData *data)
 {
@@ -94,8 +92,6 @@
 }
 
 
-#endif /* HAVE_LIBEXIF */
-
 #define is_active(x) (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (x)))
 
 
@@ -123,11 +119,9 @@
 		if (is_active (data->cd_created_radiobutton)) {
 			mtime = get_file_ctime (fdata->path);
 			comment_time = mtime;
-#ifdef HAVE_LIBEXIF
 		} else if (is_active (data->cd_exif_radiobutton)) {
 			mtime = get_exif_time (fdata->path);
 			comment_time = mtime;
-#endif /* HAVE_LIBEXIF */
 		} else if (is_active (data->cd_adjust_timezone_radiobutton)) {
 			time_t tz;
 
@@ -280,11 +274,7 @@
 
 	/* Set widgets data. */
 
-#ifndef HAVE_LIBEXIF
-	gtk_widget_hide (data->cd_exif_radiobutton);
-#else /* HAVE_LIBEXIF */
 	gtk_widget_set_sensitive (data->cd_exif_radiobutton, exif_time_available (data));
-#endif /* HAVE_LIBEXIF */
 
 	gtk_widget_set_sensitive (data->cd_dateedit, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->cd_following_date_radiobutton)));
 
Index: src/dlg-comment.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-comment.c,v
retrieving revision 1.30
diff -u -r1.30 dlg-comment.c
--- src/dlg-comment.c	2 Sep 2005 08:03:57 -0000	1.30
+++ src/dlg-comment.c	6 Oct 2006 19:26:59 -0000
@@ -148,9 +148,7 @@
 		t = time (NULL);
 		break;
 	case EXIF_DATE:
-#ifdef HAVE_LIBEXIF
 		t = get_exif_time (filename);
-#endif
 		break;
 	case LAST_MODIFIED_DATE:
 		t = get_file_mtime (filename);
@@ -338,10 +336,8 @@
 					  get_file_mtime (first_image));
 		break;
 	case EXIF_DATE:
-#ifdef HAVE_LIBEXIF
 		gnome_date_edit_set_time (GNOME_DATE_EDIT (data->date_dateedit),
 					  get_exif_time (first_image));
-#endif
 		break;
 	}
 
@@ -515,14 +511,7 @@
 
 	/**/
 
-#ifndef HAVE_LIBEXIF
-	data->have_exif_data = FALSE;
-#else
-	{
-		char *first_image = data->file_list->data;
-		data->have_exif_data = have_exif_time (first_image);
-	}
-#endif
+	data->have_exif_data = have_exif_time (data->file_list->data);
 	
 	first_image = data->file_list->data;
 	data->original_cdata = cdata = comments_load_comment (first_image, TRUE);
Index: src/dlg-image-prop.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-image-prop.c,v
retrieving revision 1.35
diff -u -r1.35 dlg-image-prop.c
--- src/dlg-image-prop.c	12 Feb 2006 22:13:23 -0000	1.35
+++ src/dlg-image-prop.c	6 Oct 2006 19:26:59 -0000
@@ -58,9 +58,7 @@
 enum {
 	IPROP_PAGE_GENERAL = 0,
 	IPROP_PAGE_COMMENT,
-#ifdef HAVE_LIBEXIF
 	IPROP_PAGE_EXIF,
-#endif /* HAVE_LIBEXIF */
 	IPROP_PAGE_HISTOGRAM,
 	IPROP_NUM_PAGES
 };
@@ -93,10 +91,8 @@
 	GtkTextBuffer *i_comment_textbuffer;
 	GtkWidget     *i_categories_label;
 
-#ifdef HAVE_LIBEXIF
 	GtkWidget     *i_exif_data_view;	
 	GtkWidget     *i_exif_data_container;
-#endif /* HAVE_LIBEXIF */
 
 	GtkWidget     *i_histogram_channel;
 	GtkWidget     *i_histogram_channel_alpha;
@@ -495,14 +491,12 @@
 		update_comment (data); 
 		break;
 
-#ifdef HAVE_LIBEXIF
 	case IPROP_PAGE_EXIF:
 		gth_exif_data_viewer_update (GTH_EXIF_DATA_VIEWER (data->i_exif_data_view),
 					     data->browser_viewer,
 					     gth_window_get_image_filename (GTH_WINDOW (data->browser)),
 					     NULL);
 		break;
-#endif /* HAVE_LIBEXIF */
 
 	case IPROP_PAGE_HISTOGRAM:
 		update_histogram (data);
@@ -585,9 +579,7 @@
 	data->i_comment_textview = glade_xml_get_widget (data->gui, "i_comment_textview");
 	data->i_categories_label = glade_xml_get_widget (data->gui, "i_categories_label");
 
-#ifdef HAVE_LIBEXIF
 	data->i_exif_data_container = glade_xml_get_widget (data->gui, "i_exif_data_container");
-#endif /* HAVE_LIBEXIF */
 
 	data->i_comment_textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (data->i_comment_textview));
 
@@ -637,10 +629,6 @@
 
 	/* * exif data */
 
-#ifndef HAVE_LIBEXIF
-	gtk_notebook_remove_page (GTK_NOTEBOOK (data->i_notebook), 2);
-#endif /* ! HAVE_LIBEXIF */
-
 	/* * image viewer */
 
 	data->image = gtk_image_new ();
@@ -651,11 +639,9 @@
 
 	g_object_set_data (G_OBJECT (data->dialog), "dialog_data", data);
 
-#ifdef HAVE_LIBEXIF
 	data->i_exif_data_view = gth_exif_data_viewer_new (FALSE);
 	gtk_container_add (GTK_CONTAINER (data->i_exif_data_container), 
 			   data->i_exif_data_view);
-#endif /* HAVE_LIBEXIF */
 
 	/* Set the signals handlers. */
 	
Index: src/dlg-jpegtran.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-jpegtran.c,v
retrieving revision 1.36.2.1
diff -u -r1.36.2.1 dlg-jpegtran.c
--- src/dlg-jpegtran.c	6 Oct 2006 16:00:02 -0000	1.36.2.1
+++ src/dlg-jpegtran.c	6 Oct 2006 19:27:00 -0000
@@ -33,13 +33,11 @@
 #include <libgnomevfs/gnome-vfs-mime.h>
 #include <glade/glade.h>
 
-#ifdef HAVE_LIBEXIF
 #include <libexif/exif-data.h>
 #include <libexif/exif-content.h>
 #include <libexif/exif-entry.h>
 #include <libexif/exif-utils.h>
 #include "jpegutils/jpeg-data.h"
-#endif /* HAVE_LIBEXIF */
 
 #include "file-utils.h"
 #include "gconf-utils.h"
Index: src/dlg-web-exporter.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/dlg-web-exporter.c,v
retrieving revision 1.33
diff -u -r1.33 dlg-web-exporter.c
--- src/dlg-web-exporter.c	18 May 2006 12:40:30 -0000	1.33
+++ src/dlg-web-exporter.c	6 Oct 2006 19:27:01 -0000
@@ -1115,12 +1115,8 @@
 	CaptionDialogData *cdata;
 	GtkWidget         *ok_button;
 	GtkWidget         *cancel_button;
-#ifdef HAVE_LIBEXIF
 	const char        *gconf_key;
 	GthCaptionFields   caption = 0;
-#else
-	GtkWidget         *vbox;
-#endif
 	cdata = g_new (CaptionDialogData, 1);
 
 	cdata->data = tdata->data;
@@ -1170,8 +1166,6 @@
 
 	/* Set widgets data. */
 
-#ifdef HAVE_LIBEXIF
-
 	if (cdata->thumbnail_caption) 
 		gconf_key = PREF_WEB_ALBUM_INDEX_CAPTION;
 	 else 
@@ -1203,10 +1197,6 @@
 	if (caption & GTH_CAPTION_EXIF_CAMERA_MODEL)
 		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cdata->c_exif_camera_model_checkbutton), TRUE);
 
-#else /* ! HAVE_LIBEXIF */
-	vbox = glade_xml_get_widget (cdata->gui, "c_exif_data_vbox");
-	gtk_widget_hide (vbox);
-#endif /* ! HAVE_LIBEXIF */
 
 	/* Run dialog. */
 
Index: src/gth-batch-op.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/gth-batch-op.c,v
retrieving revision 1.4
diff -u -r1.4 gth-batch-op.c
--- src/gth-batch-op.c	21 Mar 2006 16:37:43 -0000	1.4
+++ src/gth-batch-op.c	6 Oct 2006 19:27:02 -0000
@@ -39,9 +39,7 @@
 #include "pixbuf-utils.h"
 #include "dlg-save-image.h"
 #include "comments.h"
-#ifdef HAVE_LIBEXIF
 #include "gth-exif-utils.h"
-#endif /* HAVE_LIBEXIF */
 
 #define CONVERT_GLADE_FILE "gthumb_convert.glade"
 #define PROGRESS_GLADE_FILE "gthumb_tools.glade"
Index: src/gth-browser.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/gth-browser.c,v
retrieving revision 1.62
diff -u -r1.62 gth-browser.c
--- src/gth-browser.c	1 Oct 2006 11:25:39 -0000	1.62
+++ src/gth-browser.c	6 Oct 2006 19:27:08 -0000
@@ -69,10 +69,8 @@
 #include "pixbuf-utils.h"
 #include "thumb-cache.h"
 
-#ifdef HAVE_LIBEXIF
 #include <libexif/exif-data.h>
 #include "jpegutils/jpeg-data.h"
-#endif /* HAVE_LIBEXIF */
 
 #ifdef HAVE_LIBIPTCDATA
 #include <libiptcdata/iptc-data.h>
@@ -237,9 +235,7 @@
 	guint               view_image_timeout; /* timer for the 
 						 * view_image_at_pos function.
 						 */
-#ifdef HAVE_LIBEXIF
 	ExifData           *exif_data;
-#endif /* HAVE_LIBEXIF */
 
 #ifdef HAVE_LIBIPTCDATA
 	IptcData           *iptc_data;
@@ -484,9 +480,7 @@
 		height = 0;
 	}
 
-#ifdef HAVE_LIBEXIF
 	timer = get_exif_time (path);
-#endif
 	if (timer == 0)
 		timer = get_file_mtime (path);
 	tm = localtime (&timer);
@@ -604,7 +598,6 @@
 	window_update_statusbar_image_info (browser);
 	window_update_statusbar_zoom_info (browser);
 
-#ifdef HAVE_LIBEXIF
 	{
 		GthBrowserPrivateData *priv = browser->priv;
 		JPEGData              *jdata = NULL;
@@ -625,16 +618,11 @@
 			jpeg_data_unref (jdata);
 		}
 	}
-#endif /* HAVE_LIBEXIF */
 	
 	gth_exif_data_viewer_update (GTH_EXIF_DATA_VIEWER (browser->priv->exif_data_viewer), 
 				     IMAGE_VIEWER (browser->priv->viewer),
 				     browser->priv->image_path,
-#ifdef HAVE_LIBEXIF
 				     browser->priv->exif_data
-#else /* ! HAVE_LIBEXIF */
-				     NULL
-#endif /* ! HAVE_LIBEXIF */
 				     );
 
 	update_image_comment (browser);
@@ -1780,7 +1768,6 @@
 save_jpeg_data (GthBrowser *browser,
 		const char *filename)
 {
-#ifdef HAVE_LIBEXIF
 	GthBrowserPrivateData *priv = browser->priv;
 	gboolean               data_to_save = FALSE;
 	JPEGData              *jdata;
@@ -1831,7 +1818,6 @@
 	jpeg_data_save_file (jdata, filename);
 	jpeg_data_unref (jdata);
 
-#endif /* HAVE_LIBEXIF */
 }
 
 
@@ -5286,12 +5272,10 @@
 			priv->image_path_saved = NULL;
 		}
 		
-#ifdef HAVE_LIBEXIF
 		if (priv->exif_data != NULL) {
 			exif_data_unref (priv->exif_data);
 			priv->exif_data = NULL;
 		}
-#endif /* HAVE_LIBEXIF */
 
 #ifdef HAVE_LIBIPTCDATA
 		if (priv->iptc_data != NULL) {
@@ -8377,7 +8361,6 @@
 		return NULL;
 	}
 
-#ifdef HAVE_LIBJPEG
 	if (image_is_jpeg (fdata->path)) {
 		int width = 0, height = 0;
 
@@ -8391,7 +8374,6 @@
 			return NULL;
 		}
 	}
-#endif /* HAVE_LIBJPEG */
 
 	file_data_unref (fdata);
 
Index: src/gth-exif-data-viewer.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/gth-exif-data-viewer.c,v
retrieving revision 1.17
diff -u -r1.17 gth-exif-data-viewer.c
--- src/gth-exif-data-viewer.c	12 Feb 2006 22:13:23 -0000	1.17
+++ src/gth-exif-data-viewer.c	6 Oct 2006 19:27:09 -0000
@@ -36,11 +36,9 @@
 #include "gth-exif-data-viewer.h"
 #include "image-viewer.h"
 
-#ifdef HAVE_LIBEXIF
 #include <libexif/exif-data.h>
 #include <libexif/exif-content.h>
 #include <libexif/exif-entry.h>
-#endif /* HAVE_LIBEXIF */
 
 
 enum {
@@ -198,8 +196,6 @@
 }
 
 
-#ifdef HAVE_LIBEXIF
-
 static ExifTag usefull_tags[] = {
 	0, 
 
@@ -449,8 +445,6 @@
 	exif_data_unref (edata);
 }
 
-#endif /* HAVE_LIBEXIF */
-
 
 static void
 update_file_info (GthExifDataViewer *edv)
@@ -574,9 +568,7 @@
 	if (edv->priv->view_file_info)
 		update_file_info (edv);
 
-#ifdef HAVE_LIBEXIF
 	update_exif_data (edv, exif_data);
-#endif /* HAVE_LIBEXIF */
 }
 
 
Index: src/gth-fullscreen.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/gth-fullscreen.c,v
retrieving revision 1.34
diff -u -r1.34 gth-fullscreen.c
--- src/gth-fullscreen.c	17 Aug 2006 16:16:45 -0000	1.34
+++ src/gth-fullscreen.c	6 Oct 2006 19:27:10 -0000
@@ -847,9 +847,7 @@
 
 	zoom = (int) (image_viewer->zoom_level * 100.0);
 
-#ifdef HAVE_LIBEXIF
 	timer = get_exif_time (image_filename);
-#endif
 	if (timer == 0)
 		timer = get_file_mtime (image_filename);
 	tm = localtime (&timer);
Index: src/gth-viewer.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/gth-viewer.c,v
retrieving revision 1.34
diff -u -r1.34 gth-viewer.c
--- src/gth-viewer.c	8 May 2006 18:13:48 -0000	1.34
+++ src/gth-viewer.c	6 Oct 2006 19:27:12 -0000
@@ -30,10 +30,8 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
 
-#ifdef HAVE_LIBEXIF
 #include <libexif/exif-data.h>
 #include "jpegutils/jpeg-data.h"
-#endif /* HAVE_LIBEXIF */
 
 #ifdef HAVE_LIBIPTCDATA
 #include <libiptcdata/iptc-data.h>
@@ -129,9 +127,7 @@
 	time_t           image_mtime; 
 	gboolean         image_error;
 
-#ifdef HAVE_LIBEXIF
 	ExifData        *exif_data;
-#endif /* HAVE_LIBEXIF */
 
 #ifdef HAVE_LIBIPTCDATA
 	IptcData        *iptc_data;
@@ -277,12 +273,10 @@
 	if (viewer->priv != NULL) {
 		GthViewerPrivateData *priv = viewer->priv;
 
-#ifdef HAVE_LIBEXIF
 		if (priv->exif_data != NULL) {
 			exif_data_unref (priv->exif_data);
 			priv->exif_data = NULL;
 		}
-#endif /* HAVE_LIBEXIF */
 		
 #ifdef HAVE_LIBIPTCDATA
 		if (priv->iptc_data != NULL) {
@@ -570,9 +564,7 @@
 		height = 0;
 	}
 
-#ifdef HAVE_LIBEXIF
 	timer = get_exif_time (path);
-#endif
 	if (timer == 0)
 		timer = get_file_mtime (path);
 	tm = localtime (&timer);
@@ -680,7 +672,6 @@
 	viewer_update_statusbar_image_info (viewer);
 	viewer_update_statusbar_zoom_info (viewer);
 
-#ifdef HAVE_LIBEXIF
 	{
 		JPEGData *jdata = NULL;
 
@@ -700,16 +691,11 @@
 			jpeg_data_unref (jdata);
 		}
 	}
-#endif /* HAVE_LIBEXIF */
 
 	gth_exif_data_viewer_update (GTH_EXIF_DATA_VIEWER (priv->exif_data_viewer), 
 				     IMAGE_VIEWER (priv->viewer),
 				     priv->image_path,
-#ifdef HAVE_LIBEXIF
 				     viewer->priv->exif_data
-#else /* ! HAVE_LIBEXIF */
-				     NULL
-#endif /* ! HAVE_LIBEXIF */
 				     );
 
 	update_image_comment (viewer);
@@ -849,7 +835,6 @@
 save_jpeg_data (GthViewer  *viewer,
 		const char *filename)
 {
-#ifdef HAVE_LIBEXIF
 	GthViewerPrivateData  *priv = viewer->priv;
 	gboolean               data_to_save = FALSE;
 	JPEGData              *jdata;
@@ -896,8 +881,6 @@
 
 	jpeg_data_save_file (jdata, filename);
 	jpeg_data_unref (jdata);
-
-#endif /* HAVE_LIBEXIF */
 }
 
 
Index: src/rotation-utils.c
===================================================================
RCS file: /cvs/gnome/gthumb/src/rotation-utils.c,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 rotation-utils.c
--- src/rotation-utils.c	6 Oct 2006 16:00:02 -0000	1.6.2.1
+++ src/rotation-utils.c	6 Oct 2006 19:27:12 -0000
@@ -51,16 +51,11 @@
 update_rotation_from_exif_data (const char   *path,
 				RotationData *rot_data)
 {
-#ifdef HAVE_LIBEXIF
 	GthExifOrientation orientation;
 
-#endif /* HAVE_LIBEXIF */
-
 	rot_data->rot_type = GTH_TRANSFORM_ROTATE_0;
 	rot_data->tran_type = GTH_TRANSFORM_NONE;
 
-#ifdef HAVE_LIBEXIF
-
 	path = get_file_path_from_uri (path);
 	if (path == NULL)
 		return;
@@ -104,7 +99,6 @@
 		rot_data->tran_type = GTH_TRANSFORM_NONE;
 		break;
 	}
-#endif /* HAVE_LIBEXIF */
 }
 
 void
@@ -113,15 +107,11 @@
 			   RotationData *rot_data)
 
 {
-#ifdef HAVE_LIBEXIF
 	if (get_exif_tag_short(path,EXIF_TAG_ORIENTATION)) {
 		update_orientation_field (path, rot_data);
 	} else {
 		apply_transformation_jpeg(win, path, rot_data);
 	}
-#else
-	apply_transformation_jpeg(win, path, rot_data);
-#endif
 }
 
 void
@@ -135,11 +125,7 @@
 	char        *tmp1, *tmp2;
 	static int   count = 0;
 	GError      *err = NULL;
-#ifdef HAVE_LIBJPEG
 	JXFORM_CODE  transf;
-#else
-	char        *command;
-#endif
 	char        *e1, *e2;
 
 	path = get_file_path_from_uri (path);
@@ -157,7 +143,6 @@
 					getpid (),
 					count++);
 
-#ifdef HAVE_LIBJPEG
 		switch (rot_type) {
 		case GTH_TRANSFORM_ROTATE_90:
 			transf = JXFORM_ROT_90;
@@ -180,38 +165,6 @@
 			return;
 		}
 
-#else
-		switch (rot_type) {
-		case GTH_TRANSFORM_ROTATE_90:
-			command = "-rotate 90"; 
-			break;
-		case GTH_TRANSFORM_ROTATE_180:
-			command = "-rotate 180"; 
-			break;
-		case GTH_TRANSFORM_ROTATE_270:
-			command = "-rotate 270"; 
-			break;
-		default:
-			break;
-		}
-
-		e1 = shell_escape (tmp1);
-		e2 = shell_escape (path);
-	
-		line = g_strdup_printf ("jpegtran -copy all %s -outfile %s %s",
-					command, e1, e2);
-		g_spawn_command_line_sync (line, NULL, NULL, NULL, &err);  
-
-		g_free (e1);
-		g_free (e2);
-		g_free (line);
-
-		if (err != NULL) {
-			g_free (tmp1);
-			_gtk_error_dialog_from_gerror_run (win, &err);
-			return;
-		}
-#endif
 	}
 
 	if (tran_type == GTH_TRANSFORM_NONE)
@@ -222,7 +175,6 @@
 					getpid (),
 					count++);
 
-#ifdef HAVE_LIBJPEG
 		switch (tran_type) {
 		case GTH_TRANSFORM_MIRROR:
 			transf = JXFORM_FLIP_H;
@@ -242,36 +194,6 @@
 			return;
 		}
 
-#else
-		switch (tran_type) {
-		case GTH_TRANSFORM_MIRROR:
-			command = "-flip horizontal"; 
-			break;
-		case GTH_TRANSFORM_FLIP:
-			command = "-flip vertical"; 
-			break;
-		default:
-			return;
-		}
-
-		e1 = shell_escape (tmp2);
-		e2 = shell_escape (tmp1);
-
-		line = g_strdup_printf ("jpegtran -copy all %s -outfile %s %s",
-					command, e1, e2);
-		g_spawn_command_line_sync (line, NULL, NULL, NULL, &err);  
-
-		g_free (e1);
-		g_free (e2);
-		g_free (line);
-
-		if (err != NULL) {
-			g_free (tmp1);
-			g_free (tmp2);
-			_gtk_error_dialog_from_gerror_run (win, &err);
-			return;
-		}
-#endif
 	}
 
 	e1 = shell_escape (tmp2);
@@ -284,11 +206,9 @@
 		_gtk_error_dialog_from_gerror_run (win, &err);
 
 	} else {
-#ifdef HAVE_LIBEXIF
 		if ((rot_type == GTH_TRANSFORM_ROTATE_90) || (rot_type == GTH_TRANSFORM_ROTATE_270))
 			swap_xy_exif_fields (path);
 		reset_orientation_field (path);
-#endif
 	}
 
 	g_free (e1);
@@ -366,8 +286,6 @@
 }
 
 
-#ifdef HAVE_LIBEXIF
-
 ExifShort
 get_next_value_rotation_90 (int value)
 {
@@ -593,6 +511,4 @@
 	exif_data_unref (edata);
 	jpeg_data_unref (jdata);
 }
-
-#endif /* HAVE_LIBEXIF */
 
Index: src/rotation-utils.h
===================================================================
RCS file: /cvs/gnome/gthumb/src/rotation-utils.h,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 rotation-utils.h
--- src/rotation-utils.h	6 Oct 2006 16:00:02 -0000	1.2.2.1
+++ src/rotation-utils.h	6 Oct 2006 19:27:12 -0000
@@ -27,9 +27,7 @@
 #include <gtk/gtk.h>
 #include "typedefs.h"
 
-#ifdef HAVE_LIBEXIF
 #include "gth-exif-utils.h"
-#endif /* HAVE_LIBEXIF */
 
 typedef struct _RotationData RotationData;
 struct _RotationData {
@@ -50,7 +48,6 @@
 void			apply_transformation_generic   (GtkWindow       *win,
 							const char      *filename,
 							RotationData 	*rot_data);
-#ifdef HAVE_LIBEXIF
 ExifShort		get_next_value_rotation_90     (int value);
 ExifShort		get_next_value_mirror          (int value);
 ExifShort		get_next_value_flip            (int value);
@@ -61,6 +58,5 @@
 							ExifTag          tag1,
 							ExifTag          tag2);
 void			swap_xy_exif_fields            (const char      *filename);
-#endif /* HAVE_LIBEXIF */
 
 #endif /* ROTATION_UTILS_H */
