[maemo-commits] [maemo-commits] r18414 - in projects/haf/trunk/hildon-thumbnail: . daemon daemon/plugins

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2009-05-18 11:51:50 +0300 (Mon, 18 May 2009)
New Revision: 18414

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
Log:
2009-05-18  Philip Van Hoof  <pvanhoof at codeminded.be>

	* daemon/plugins/gdkpixbuf-png-out-plugin.c
	* daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
	* daemon/thumbnailer.c: Bugfix for Bug# 117288



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-18 08:39:52 UTC (rev 18413)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-18 08:51:50 UTC (rev 18414)
@@ -1,3 +1,9 @@
+2009-05-18  Philip Van Hoof  <pvanhoof at codeminded.be>
+
+	* daemon/plugins/gdkpixbuf-png-out-plugin.c
+	* daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
+	* daemon/thumbnailer.c: Bugfix for Bug# 117288
+
 2009-05-15  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 3.0.26

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2009-05-18 08:39:52 UTC (rev 18413)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2009-05-18 08:51:50 UTC (rev 18414)
@@ -167,7 +167,7 @@
 gboolean
 hildon_thumbnail_outplugin_needs_out (HildonThumbnailPluginOutType type, guint64 mtime, const gchar *uri, gboolean *err_file)
 {
-	gboolean retval, check = FALSE;
+	gboolean retval, check = FALSE, f = FALSE;
 	gchar *large, *normal, *cropped, *filen, *filenp;
 	GFile *parent, *file, *fail_file, *fail_dir;
 
@@ -209,6 +209,7 @@
 		g_object_unref (file);
 		file = g_object_ref (fail_file);
 		check = TRUE;
+		f = TRUE;
 	} else if (g_file_query_exists (file, NULL)) {
 		check = TRUE;
 	}
@@ -223,7 +224,7 @@
 			fmtime = g_file_info_get_attribute_uint64 (info, 
 								   G_FILE_ATTRIBUTE_TIME_MODIFIED);
 			if (fmtime == (guint64) mtime) {
-				if (err_file)
+				if (err_file && f)
 					*err_file = TRUE;
 				retval = FALSE;
 			}

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2009-05-18 08:39:52 UTC (rev 18413)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2009-05-18 08:51:50 UTC (rev 18414)
@@ -189,7 +189,7 @@
 gboolean
 hildon_thumbnail_outplugin_needs_out (HildonThumbnailPluginOutType type, guint64 mtime, const gchar *uri, gboolean *err_file)
 {
-	gboolean retval, check = FALSE;
+	gboolean retval, check = FALSE, f = FALSE;
 	gchar *large, *normal, *cropped, *filen, *filenp;
 	GFile *parent, *file, *fail_file, *fail_dir;
 
@@ -231,6 +231,7 @@
 		g_object_unref (file);
 		file = g_object_ref (fail_file);
 		check = TRUE;
+		f = TRUE;
 	} else if (g_file_query_exists (file, NULL)) {
 		check = TRUE;
 	}
@@ -245,7 +246,7 @@
 			fmtime = g_file_info_get_attribute_uint64 (info, 
 								   G_FILE_ATTRIBUTE_TIME_MODIFIED);
 			if (fmtime == (guint64) mtime) {
-				if (err_file)
+				if (err_file && f)
 					*err_file = TRUE;
 				retval = FALSE;
 			}

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2009-05-18 08:39:52 UTC (rev 18413)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2009-05-18 08:51:50 UTC (rev 18414)
@@ -494,17 +494,38 @@
 		get_some_file_infos (urls[i], &mime_type, &mtime_x,
 				     mhint, &error);
 
+
+#ifdef LARGE_THUMBNAILS
 		has_thumb = (thumb_check (large, mtime_x) && 
 			     thumb_check (normal, mtime_x) && 
 			     thumb_check (cropped, mtime_x));
+#else
+	#ifdef NORMAL_THUMBNAILS
+		has_thumb = (thumb_check (normal, mtime_x) && 
+			     thumb_check (cropped, mtime_x));
+	#else
+		has_thumb =  thumb_check (cropped, mtime_x);
+	#endif
+#endif
 
+
 		if (!has_thumb) {
 			gchar *pnormal = NULL, *plarge = NULL, *pcropped = NULL;
 			hildon_thumbnail_util_get_thumb_paths (urls[i], &plarge, &pnormal, &pcropped, 
 						       NULL, NULL, NULL, FALSE);
+
+#ifdef LARGE_THUMBNAILS
 			has_thumb = (thumb_check (plarge, mtime_x) && 
 				     thumb_check (pnormal, mtime_x) && 
 				     thumb_check (pcropped, mtime_x));
+#else
+	#ifdef NORMAL_THUMBNAILS
+			has_thumb = (thumb_check (pnormal, mtime_x) && 
+				     thumb_check (pcropped, mtime_x));
+	#else
+			has_thumb =  thumb_check (pcropped, mtime_x);
+	#endif
+#endif
 
 			if (has_thumb) {
 				g_free (normal);