[Rawstudio-commit] r2067 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-10-13 21:50:12 +0200 (Mon, 13 Oct 2008)
New Revision: 2067

Modified:
   trunk/src/rs-metadata.c
Log:
Refactored rs_metadata_cache_load() a bit.

Modified: trunk/src/rs-metadata.c
===================================================================
--- trunk/src/rs-metadata.c	2008-10-13 19:49:24 UTC (rev 2066)
+++ trunk/src/rs-metadata.c	2008-10-13 19:50:12 UTC (rev 2067)
@@ -180,6 +180,7 @@
 static gboolean
 rs_metadata_cache_load(RSMetadata *metadata, const gchar *filename)
 {
+	gboolean ret = FALSE;
 	gchar *basename;
 	gchar *dotdir = rs_dotdir_get(filename);
 	gchar *cache_filename;
@@ -324,23 +325,24 @@
 
 			cur = cur->next;
 		}
-		
+		ret = TRUE;
 	}
 
 	xmlFreeDoc(doc);
 	g_free(cache_filename);
 
-	thumb_filename = g_strdup_printf("%s/%s.thumb.png", dotdir, basename);
-	metadata->thumbnail = gdk_pixbuf_new_from_file(thumb_filename, NULL);
-	gdk_pixbuf_save(metadata->thumbnail, thumb_filename, "png", NULL, NULL);
-	g_free(thumb_filename);
+	if (ret == TRUE)
+	{
+		thumb_filename = g_strdup_printf("%s/%s.thumb.png", dotdir, basename);
+		metadata->thumbnail = gdk_pixbuf_new_from_file(thumb_filename, NULL);
+		g_free(thumb_filename);
+		if (!metadata->thumbnail)
+			ret = FALSE;
+	}
 
 	g_free(basename);
 
-	if (metadata->thumbnail)
-		return TRUE;
-	else
-		return FALSE;
+	return ret;
 }
 #undef METACACHEVERSION