eog r4594 - in branches/gnome-2-22: . src

[lucasr svn gnome org]

Author: lucasr
Date: Mon Jun  2 21:46:23 2008
New Revision: 4594
URL: http://svn.gnome.org/viewvc/eog?rev=4594&view=rev

Log:
2008-06-03  Lucas Rocha  <lucasr gnome org>

	* src/eog-thumbnail.c (eog_thumbnail_load): never generate any
	thumbnail when viewing thumbnails. Fixes bug #533041.


Modified:
   branches/gnome-2-22/ChangeLog
   branches/gnome-2-22/src/eog-thumbnail.c

Modified: branches/gnome-2-22/src/eog-thumbnail.c
==============================================================================
--- branches/gnome-2-22/src/eog-thumbnail.c	(original)
+++ branches/gnome-2-22/src/eog-thumbnail.c	Mon Jun  2 21:46:23 2008
@@ -142,20 +142,14 @@
 #endif
 	g_assert (factory != NULL);
 	
-	if (gnome_thumbnail_factory_can_thumbnail (factory, data->uri_str, data->mime_type, data->mtime)) 
-	{
-		thumb = gnome_thumbnail_factory_generate_thumbnail (factory, data->uri_str, data->mime_type);
-		
-		if (thumb != NULL) {
-			gnome_thumbnail_factory_save_thumbnail (factory, thumb, data->uri_str, data->mtime);
-		}
-		else {
-			set_thumb_error (error, EOG_THUMB_ERROR_GENERIC, "Thumbnail creation failed");
-		}
-	} 
+	thumb = gnome_thumbnail_factory_generate_thumbnail (factory, data->uri_str, data->mime_type);
+	
+	if (thumb != NULL) {
+		gnome_thumbnail_factory_save_thumbnail (factory, thumb, data->uri_str, data->mtime);
+	}
 	else {
 		set_thumb_error (error, EOG_THUMB_ERROR_GENERIC, "Thumbnail creation failed");
-	}
+	} 
 	
 	return thumb;
 }
@@ -490,7 +484,8 @@
 	/* check if there is already a valid thumbnail */
 	thumb = get_valid_thumbnail (data, error);
 
-	if (*error == NULL && thumb == NULL) {
+	if (*error == NULL && thumb == NULL &&
+	    gnome_thumbnail_factory_can_thumbnail (factory, data->uri_str, data->mime_type, data->mtime)) {
 		pixbuf = eog_image_get_pixbuf (image);
 		if (pixbuf != NULL) {
 			thumb = create_thumbnail_from_pixbuf (data, pixbuf, error);