eog r4593 - in trunk: . src

[lucasr svn gnome org]

Author: lucasr
Date: Mon Jun  2 21:37:35 2008
New Revision: 4593
URL: http://svn.gnome.org/viewvc/eog?rev=4593&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:
   trunk/ChangeLog
   trunk/src/eog-thumbnail.c

Modified: trunk/src/eog-thumbnail.c
==============================================================================
--- trunk/src/eog-thumbnail.c	(original)
+++ trunk/src/eog-thumbnail.c	Mon Jun  2 21:37:35 2008
@@ -475,7 +475,7 @@
 
 	if (thumb != NULL) {
 		eog_debug_message (DEBUG_THUMBNAIL, "%s: loaded from cache",data->uri_str);
-	} else {
+	} else if (gnome_thumbnail_factory_can_thumbnail (factory, data->uri_str, data->mime_type, data->mtime)) {
 		pixbuf = eog_image_get_pixbuf (image);
 
 		if (pixbuf != NULL) {
@@ -487,8 +487,7 @@
 		} else {
 			/* generate a thumbnail from the file */
 			eog_debug_message (DEBUG_THUMBNAIL, "%s: creating from file",data->uri_str);
-			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);
+			thumb = gnome_thumbnail_factory_generate_thumbnail (factory, data->uri_str, data->mime_type);
 		}
 
 		if (thumb != NULL) {