[eog] Dont use EogExifData in the C api

[Felix Riemann <friemann src gnome org>]

commit f457e6cd2f9b25194145681109ae4bd7f3b4ee7f
Author: Claudio Saavedra <csaavedra igalia com>
Date:   Thu Dec 23 16:27:13 2010 +0200

    Dont use EogExifData in the C api
    
    https://bugzilla.gnome.org/show_bug.cgi?id=626257

 plugins/statusbar-date/eog-statusbar-date-plugin.c |    2 +-
 src/eog-exif-util.c                                |    2 ++
 src/eog-exif-util.h                                |    8 ++++----
 src/eog-image.c                                    |    4 ++--
 src/eog-image.h                                    |    2 +-
 src/eog-metadata-reader.c                          |    4 ++--
 src/eog-metadata-reader.h                          |    2 +-
 src/eog-properties-dialog.c                        |    2 +-
 8 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/plugins/statusbar-date/eog-statusbar-date-plugin.c b/plugins/statusbar-date/eog-statusbar-date-plugin.c
index ea12e5f..2bfc04f 100644
--- a/plugins/statusbar-date/eog-statusbar-date-plugin.c
+++ b/plugins/statusbar-date/eog-statusbar-date-plugin.c
@@ -56,7 +56,7 @@ statusbar_set_date (GtkStatusbar *statusbar, EogThumbView *view)
 	EogImage *image;
 	gchar *date = NULL;
 	gchar time_buffer[32];
-	EogExifData *exif_data;
+	ExifData *exif_data;
 
 	if (eog_thumb_view_get_n_selected (view) == 0)
 		return;
diff --git a/src/eog-exif-util.c b/src/eog-exif-util.c
index fd172ec..7a02fcf 100644
--- a/src/eog-exif-util.c
+++ b/src/eog-exif-util.c
@@ -48,6 +48,8 @@
 #define GPOINTER_TO_BOOLEAN(i) ((gboolean) ((GPOINTER_TO_INT (i) == 2) ? TRUE : FALSE))
 #endif
 
+typedef ExifData EogExifData;
+
 /* Define EogExifData type */
 G_DEFINE_BOXED_TYPE(EogExifData, eog_exif_data, eog_exif_data_copy, eog_exif_data_free)
 
diff --git a/src/eog-exif-util.h b/src/eog-exif-util.h
index 9cf9abc..1b00c41 100644
--- a/src/eog-exif-util.h
+++ b/src/eog-exif-util.h
@@ -33,16 +33,16 @@
 
 G_BEGIN_DECLS
 
-typedef ExifData EogExifData;
+#define EOG_TYPE_EXIF_DATA eog_exif_data_get_type ()
 
 gchar*       eog_exif_util_format_date           (const gchar *date);
 
-const gchar *eog_exif_data_get_value             (EogExifData *exif_data, gint tag_id, gchar *buffer, guint buf_size);
+const gchar *eog_exif_data_get_value             (ExifData *exif_data, gint tag_id, gchar *buffer, guint buf_size);
 
 GType                 eog_exif_data_get_type           (void) G_GNUC_CONST;
 
-EogExifData * eog_exif_data_copy (EogExifData *data);
-void          eog_exif_data_free (EogExifData *data);
+ExifData * eog_exif_data_copy (ExifData *data);
+void          eog_exif_data_free (ExifData *data);
 
 G_END_DECLS
 
diff --git a/src/eog-image.c b/src/eog-image.c
index 44da98f..7a039e7 100644
--- a/src/eog-image.c
+++ b/src/eog-image.c
@@ -1887,11 +1887,11 @@ eog_image_cancel_load (EogImage *img)
 }
 
 #ifdef HAVE_EXIF
-EogExifData *
+ExifData *
 eog_image_get_exif_info (EogImage *img)
 {
 	EogImagePrivate *priv;
-	EogExifData *data = NULL;
+	ExifData *data = NULL;
 
 	g_return_val_if_fail (EOG_IS_IMAGE (img), NULL);
 
diff --git a/src/eog-image.h b/src/eog-image.h
index f674648..4cfef95 100644
--- a/src/eog-image.h
+++ b/src/eog-image.h
@@ -170,7 +170,7 @@ const gchar*      eog_image_get_caption              (EogImage   *img);
 const gchar      *eog_image_get_collate_key          (EogImage   *img);
 
 #if HAVE_EXIF
-EogExifData*      eog_image_get_exif_info            (EogImage   *img);
+ExifData*      eog_image_get_exif_info            (EogImage   *img);
 #endif
 
 gpointer          eog_image_get_xmp_info             (EogImage   *img);
diff --git a/src/eog-metadata-reader.c b/src/eog-metadata-reader.c
index 03233c3..54d0563 100644
--- a/src/eog-metadata-reader.c
+++ b/src/eog-metadata-reader.c
@@ -102,7 +102,7 @@ eog_metadata_reader_get_exif_chunk (EogMetadataReader *emr, guchar **data, guint
 }
 
 #ifdef HAVE_EXIF
-EogExifData*
+ExifData*
 eog_metadata_reader_get_exif_data (EogMetadataReader *emr)
 {
 	gpointer exif_data = NULL;
@@ -113,7 +113,7 @@ eog_metadata_reader_get_exif_data (EogMetadataReader *emr)
 	if (iface->get_exif_data)
 		exif_data = iface->get_exif_data (emr);
 
-	return (EogExifData *)exif_data;
+	return exif_data;
 }
 #endif
 
diff --git a/src/eog-metadata-reader.h b/src/eog-metadata-reader.h
index 39b572e..86652be 100644
--- a/src/eog-metadata-reader.h
+++ b/src/eog-metadata-reader.h
@@ -89,7 +89,7 @@ void                 eog_metadata_reader_get_exif_chunk (EogMetadataReader *emr,
 
 #ifdef HAVE_EXIF
 G_GNUC_INTERNAL
-EogExifData*         eog_metadata_reader_get_exif_data	(EogMetadataReader *emr);
+ExifData*         eog_metadata_reader_get_exif_data	(EogMetadataReader *emr);
 #endif
 
 #ifdef HAVE_EXEMPI
diff --git a/src/eog-properties-dialog.c b/src/eog-properties-dialog.c
index 6c8d89a..cd6c914 100644
--- a/src/eog-properties-dialog.c
+++ b/src/eog-properties-dialog.c
@@ -178,7 +178,7 @@ pd_update_general_tab (EogPropertiesDialog *prop_dlg,
 
 #if HAVE_EXIF
 static void
-eog_exif_set_label (GtkWidget *w, EogExifData *exif_data, gint tag_id)
+eog_exif_set_label (GtkWidget *w, ExifData *exif_data, gint tag_id)
 {
 	gchar exif_buffer[512];
 	const gchar *buf_ptr;