diff options
| -rw-r--r-- | plugins/statusbar-date/eom-statusbar-date-plugin.c | 2 | ||||
| -rw-r--r-- | src/eom-exif-util.c | 2 | ||||
| -rw-r--r-- | src/eom-exif-util.h | 8 | ||||
| -rw-r--r-- | src/eom-image.c | 4 | ||||
| -rw-r--r-- | src/eom-image.h | 2 | ||||
| -rw-r--r-- | src/eom-metadata-reader.c | 4 | ||||
| -rw-r--r-- | src/eom-metadata-reader.h | 2 | ||||
| -rw-r--r-- | src/eom-properties-dialog.c | 2 |
8 files changed, 14 insertions, 12 deletions
diff --git a/plugins/statusbar-date/eom-statusbar-date-plugin.c b/plugins/statusbar-date/eom-statusbar-date-plugin.c index fc3e152..427c218 100644 --- a/plugins/statusbar-date/eom-statusbar-date-plugin.c +++ b/plugins/statusbar-date/eom-statusbar-date-plugin.c @@ -58,7 +58,7 @@ static void statusbar_set_date(GtkStatusbar* statusbar, EomThumbView* view) EomImage* image; gchar* date = NULL; gchar time_buffer[32]; - EomExifData* exif_data; + ExifData* exif_data; if (eom_thumb_view_get_n_selected(view) == 0) { diff --git a/src/eom-exif-util.c b/src/eom-exif-util.c index 95310e2..f469793 100644 --- a/src/eom-exif-util.c +++ b/src/eom-exif-util.c @@ -48,6 +48,8 @@ #define GPOINTER_TO_BOOLEAN(i) ((gboolean) ((GPOINTER_TO_INT (i) == 2) ? TRUE : FALSE)) #endif +typedef ExifData EomExifData; + /* Define EomExifData type */ G_DEFINE_BOXED_TYPE(EomExifData, eom_exif_data, eom_exif_data_copy, eom_exif_data_free) diff --git a/src/eom-exif-util.h b/src/eom-exif-util.h index 5a34be9..f1bbf62 100644 --- a/src/eom-exif-util.h +++ b/src/eom-exif-util.h @@ -33,16 +33,16 @@ G_BEGIN_DECLS -typedef ExifData EomExifData; +#define EOM_TYPE_EXIF_DATA eom_exif_data_get_type() gchar* eom_exif_util_format_date (const gchar *date); -const gchar *eom_exif_data_get_value (EomExifData *exif_data, gint tag_id, gchar *buffer, guint buf_size); +const gchar *eom_exif_data_get_value (ExifData *exif_data, gint tag_id, gchar *buffer, guint buf_size); GType eom_exif_data_get_type (void) G_GNUC_CONST; -EomExifData * eom_exif_data_copy (EomExifData *data); -void eom_exif_data_free (EomExifData *data); +ExifData * eom_exif_data_copy (ExifData *data); +void eom_exif_data_free (ExifData *data); G_END_DECLS diff --git a/src/eom-image.c b/src/eom-image.c index 4651f1a..29bbaed 100644 --- a/src/eom-image.c +++ b/src/eom-image.c @@ -1884,11 +1884,11 @@ eom_image_cancel_load (EomImage *img) } #ifdef HAVE_EXIF -EomExifData * +ExifData * eom_image_get_exif_info (EomImage *img) { EomImagePrivate *priv; - EomExifData *data = NULL; + ExifData *data = NULL; g_return_val_if_fail (EOM_IS_IMAGE (img), NULL); diff --git a/src/eom-image.h b/src/eom-image.h index 447c37d..3e503db 100644 --- a/src/eom-image.h +++ b/src/eom-image.h @@ -170,7 +170,7 @@ const gchar* eom_image_get_caption (EomImage *img); const gchar *eom_image_get_collate_key (EomImage *img); #if HAVE_EXIF -EomExifData* eom_image_get_exif_info (EomImage *img); +ExifData* eom_image_get_exif_info (EomImage *img); #endif gpointer eom_image_get_xmp_info (EomImage *img); diff --git a/src/eom-metadata-reader.c b/src/eom-metadata-reader.c index 13e025c..702f357 100644 --- a/src/eom-metadata-reader.c +++ b/src/eom-metadata-reader.c @@ -102,7 +102,7 @@ eom_metadata_reader_get_exif_chunk (EomMetadataReader *emr, guchar **data, guint } #ifdef HAVE_EXIF -EomExifData* +ExifData* eom_metadata_reader_get_exif_data (EomMetadataReader *emr) { gpointer exif_data = NULL; @@ -113,7 +113,7 @@ eom_metadata_reader_get_exif_data (EomMetadataReader *emr) if (iface->get_exif_data) exif_data = iface->get_exif_data (emr); - return (EomExifData *)exif_data; + return (ExifData *)exif_data; } #endif diff --git a/src/eom-metadata-reader.h b/src/eom-metadata-reader.h index a217a7c..9028182 100644 --- a/src/eom-metadata-reader.h +++ b/src/eom-metadata-reader.h @@ -89,7 +89,7 @@ void eom_metadata_reader_get_exif_chunk (EomMetadataReader *emr, #ifdef HAVE_EXIF G_GNUC_INTERNAL -EomExifData* eom_metadata_reader_get_exif_data (EomMetadataReader *emr); +ExifData* eom_metadata_reader_get_exif_data (EomMetadataReader *emr); #endif #ifdef HAVE_EXEMPI diff --git a/src/eom-properties-dialog.c b/src/eom-properties-dialog.c index 6d21a5c..a7e484b 100644 --- a/src/eom-properties-dialog.c +++ b/src/eom-properties-dialog.c @@ -178,7 +178,7 @@ pd_update_general_tab (EomPropertiesDialog *prop_dlg, #if HAVE_EXIF static void -eom_exif_set_label (GtkWidget *w, EomExifData *exif_data, gint tag_id) +eom_exif_set_label (GtkWidget *w, ExifData *exif_data, gint tag_id) { gchar exif_buffer[512]; const gchar *buf_ptr; |