[eog/gnome-2-32] Workaround concurrency issue with statusbar-date plugin

[Felix Riemann <friemann src gnome org>]

commit e43fa8ff82c6aedd8f6373a0a5a1a5677f32cd83
Author: Felix Riemann <friemann gnome org>
Date:   Sat Nov 13 14:08:44 2010 +0100

    Workaround concurrency issue with statusbar-date plugin
    
    Make sure that only an image loading job does autorotation. A metadata
    loading job has no use for this. Works around lost signals when the
    statusbar-date plugin is activated. Works around bug 622161.

 src/eog-image.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/eog-image.c b/src/eog-image.c
index 6d72b5a..22cda68 100644
--- a/src/eog-image.c
+++ b/src/eog-image.c
@@ -1253,9 +1253,11 @@ eog_image_load (EogImage *img, EogImageData data2read, EogJob *job, GError **err
 
 #ifdef HAVE_EXIF
 	/* Check that the metadata was loaded at least once before
-	 * trying to autorotate. */
+	 * trying to autorotate. Also only an image load job should try to
+	 * autorotate an image. */
 	if (priv->autorotate && 
-	    priv->metadata_status == EOG_IMAGE_METADATA_READY) {
+	    priv->metadata_status == EOG_IMAGE_METADATA_READY &&
+	    data2read & EOG_IMAGE_DATA_IMAGE) {
 		eog_image_real_autorotate (img);
 	}
 #endif