eog r4311 - in trunk: . src

[csaavedra svn gnome org]

Author: csaavedra
Date: Mon Jan 14 16:10:09 2008
New Revision: 4311
URL: http://svn.gnome.org/viewvc/eog?rev=4311&view=rev

Log:
2008-01-14  Claudio Saavedra  <csaavedra alumnos utalca cl>

	* src/eog-exif-details.c:
	* src/eog-properties-dialog.c: (pd_update_metadata_tab),
	(eog_properties_dialog_init): Fix build when compiled without
	libexif support but with exempi enabled. Fixes bug #509149.



Modified:
   trunk/ChangeLog
   trunk/src/eog-exif-details.c
   trunk/src/eog-properties-dialog.c

Modified: trunk/src/eog-exif-details.c
==============================================================================
--- trunk/src/eog-exif-details.c	(original)
+++ trunk/src/eog-exif-details.c	Mon Jan 14 16:10:09 2008
@@ -84,6 +84,7 @@
 	ExifCategory category;
 } ExifTagCategory;
 
+#ifdef HAVE_EXIF
 static ExifTagCategory exif_tag_category_map[] = {
 	{ EXIF_TAG_INTEROPERABILITY_INDEX,    EXIF_CATEGORY_CAMERA},
 	{ EXIF_TAG_INTEROPERABILITY_VERSION,  EXIF_CATEGORY_CAMERA},
@@ -190,6 +191,7 @@
 	{ EXIF_TAG_IMAGE_UNIQUE_ID	, EXIF_CATEGORY_IMAGE_DATA},
 	{ -1, -1 }
 };
+#endif
 
 #define MODEL_COLUMN_ATTRIBUTE 0
 #define MODEL_COLUMN_VALUE     1
@@ -276,6 +278,7 @@
 	g_type_class_add_private (object_class, sizeof (EogExifDetailsPrivate));
 }
 
+#ifdef HAVE_EXIF
 static ExifCategory
 get_exif_category (ExifEntry *entry)
 {
@@ -291,6 +294,7 @@
 
 	return cat;
 }
+#endif
 
 static char*
 set_row_data (GtkTreeStore *store, char *path, char *parent, const char *attribute, const char *value)
@@ -343,6 +347,7 @@
 	return path;
 }
 
+#ifdef HAVE_EXIF
 static void 
 exif_entry_cb (ExifEntry *entry, gpointer data)
 {
@@ -406,12 +411,15 @@
 		}
 	}
 }
+#endif
 
+#ifdef HAVE_EXIF
 static void
 exif_content_cb (ExifContent *content, gpointer data)
 {
 	exif_content_foreach_entry (content, exif_entry_cb, data);
 }
+#endif
 
 GtkWidget *
 eog_exif_details_new ()
@@ -447,6 +455,7 @@
 	}
 }
 
+#ifdef HAVE_EXIF
 void
 eog_exif_details_update (EogExifDetails *exif_details, ExifData *data)
 {
@@ -461,7 +470,7 @@
 		exif_data_foreach_content (data, exif_content_cb, exif_details);
 	}
 }
-
+#endif HAVE_EXIF
 
 #ifdef HAVE_EXEMPI
 typedef struct {

Modified: trunk/src/eog-properties-dialog.c
==============================================================================
--- trunk/src/eog-properties-dialog.c	(original)
+++ trunk/src/eog-properties-dialog.c	Mon Jan 14 16:10:09 2008
@@ -30,7 +30,6 @@
 #include "eog-thumb-view.h"
 
 #if HAVE_EXIF
-#include "eog-exif-details.h"
 #include "eog-exif-util.h"
 #endif
 
@@ -50,6 +49,10 @@
 #define HAVE_METADATA 1
 #endif
 
+#if HAVE_METADATA
+#include "eog-exif-details.h"
+#endif
+
 #define EOG_PROPERTIES_DIALOG_GET_PRIVATE(object) \
 	(G_TYPE_INSTANCE_GET_PRIVATE ((object), EOG_TYPE_PROPERTIES_DIALOG, EogPropertiesDialogPrivate))
 
@@ -82,7 +85,6 @@
 	GtkWidget      *created_label;
 	GtkWidget      *modified_label;
 #ifdef HAVE_EXIF
-	GtkWidget      *exif_box;
 	GtkWidget      *exif_aperture_label;
 	GtkWidget      *exif_exposure_label;
 	GtkWidget      *exif_focal_label;
@@ -101,6 +103,7 @@
 	GtkWidget      *xmp_details;
 #endif
 #if HAVE_METADATA
+	GtkWidget      *exif_box;
 	GtkWidget      *exif_details_expander;
 	GtkWidget      *exif_details;
 #endif
@@ -256,7 +259,10 @@
 
 	notebook = GTK_NOTEBOOK (priv->notebook);
 
-	if (!eog_image_has_data (image, EOG_IMAGE_DATA_EXIF)
+	if (TRUE
+#if HAVE_EXIF
+	    && !eog_image_has_data (image, EOG_IMAGE_DATA_EXIF)
+#endif
 #if HAVE_EXEMPI
 	    && !eog_image_has_data (image, EOG_IMAGE_DATA_XMP)
 #endif
@@ -534,7 +540,6 @@
 			         "created_label", &priv->created_label,
 			         "modified_label", &priv->modified_label,
 #ifdef HAVE_EXIF
-			         "exif_box", &priv->exif_box,
 			         "exif_aperture_label", &priv->exif_aperture_label,
 			         "exif_exposure_label", &priv->exif_exposure_label,
 			         "exif_focal_label", &priv->exif_focal_label,
@@ -543,7 +548,6 @@
 			         "exif_metering_label", &priv->exif_metering_label,
 			         "exif_model_label", &priv->exif_model_label,
 			         "exif_date_label", &priv->exif_date_label,
-			         "exif_details_expander", &priv->exif_details_expander,
 #endif
 #ifdef HAVE_EXEMPI
 				 "xmp_location_label", &priv->xmp_location_label,
@@ -555,7 +559,10 @@
 				 "xmp_box", &xmp_box,
 				 "xmp_box_label", &xmp_box_label,
 #endif
-
+#ifdef HAVE_METADATA
+			         "exif_box", &priv->exif_box,
+				 "exif_details_expander", &priv->exif_details_expander,
+#endif
 			         NULL);
 
 	g_signal_connect (dlg,