eog r4900 - in trunk: . src

[csaavedra svn gnome org]

Author: csaavedra
Date: Mon Dec  8 14:16:39 2008
New Revision: 4900
URL: http://svn.gnome.org/viewvc/eog?rev=4900&view=rev

Log:
2008-10-08  Claudio Saavedra  <csaavedra igalia com>

	* src/eog-image-private.h: Add metadata status private element.
	* src/eog-image.c: (eog_image_init): Initialize the metadata status to
	not read.
	(eog_image_real_load): Set metadata status to ready if already loaded
	and to not available if the image has no metadata.
	* src/eog-image.h: Add EogImageMetadataStatus enumeration.




Modified:
   trunk/ChangeLog
   trunk/src/eog-image-private.h
   trunk/src/eog-image.c
   trunk/src/eog-image.h

Modified: trunk/src/eog-image-private.h
==============================================================================
--- trunk/src/eog-image-private.h	(original)
+++ trunk/src/eog-image-private.h	Mon Dec  8 14:16:39 2008
@@ -32,6 +32,7 @@
 	EogImageStatus    status;
 	EogImageStatus    prev_status;
 	gboolean          is_monitored;
+        EogImageMetadataStatus metadata_status;
 
 	GdkPixbuf        *image;
 	GdkPixbuf        *thumbnail;

Modified: trunk/src/eog-image.c
==============================================================================
--- trunk/src/eog-image.c	(original)
+++ trunk/src/eog-image.c	Mon Dec  8 14:16:39 2008
@@ -245,6 +245,7 @@
 	img->priv->modified = FALSE;
 	img->priv->status_mutex = g_mutex_new ();
 	img->priv->status = EOG_IMAGE_STATUS_UNKNOWN;
+        img->priv->metadata_status = EOG_IMAGE_METADATA_NOT_READ;
 	img->priv->is_monitored = FALSE;
 	img->priv->undo_stack = NULL;
 	img->priv->trans = NULL;
@@ -953,6 +954,7 @@
 						       0,
 						       priv->width,
 						       priv->height);
+                                priv->metadata_status = EOG_IMAGE_METADATA_NOT_AVAILABLE;
                         }
 
 			first_run = FALSE;
@@ -973,6 +975,7 @@
 					eog_image_set_xmp_data (img, md_reader);
 #endif
 					set_metadata = FALSE;
+                                        priv->metadata_status = EOG_IMAGE_METADATA_READY;
 				}
 
 				if (data2read == EOG_IMAGE_DATA_EXIF)

Modified: trunk/src/eog-image.h
==============================================================================
--- trunk/src/eog-image.h	(original)
+++ trunk/src/eog-image.h	Mon Dec  8 14:16:39 2008
@@ -80,6 +80,12 @@
 	EOG_IMAGE_STATUS_FAILED
 } EogImageStatus;
 
+typedef enum {
+  EOG_IMAGE_METADATA_NOT_READ,
+  EOG_IMAGE_METADATA_NOT_AVAILABLE,
+  EOG_IMAGE_METADATA_READY
+} EogImageMetadataStatus;
+
 struct _EogImage {
 	GObject parent;