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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2009-05-25 14:33:30 +0300 (Mon, 25 May 2009)
New Revision: 18477

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/config.h.in
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c
Log:
2009-05-25  Philip Van Hoof  <pvanhoof at codeminded.be>

        * config.h.in
        * daemon/hildon-thumbnail-plugin.h
        * daemon/plugins/gdkpixbuf-plugin.c
        * daemon/plugins/exec-plugin.c
        * daemon/plugins/gdkpixbuf-png-out-plugin.c
        * daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
        * daemon/plugins/epeg-plugin.c
        * daemon/hildon-thumbnail-plugin.c: Recording the error message



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-25 10:34:54 UTC (rev 18476)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-05-25 11:33:30 UTC (rev 18477)
@@ -1,3 +1,14 @@
+2009-05-25  Philip Van Hoof  <pvanhoof at codeminded.be>
+
+	* config.h.in
+	* daemon/hildon-thumbnail-plugin.h
+	* daemon/plugins/gdkpixbuf-plugin.c
+	* daemon/plugins/exec-plugin.c
+	* daemon/plugins/gdkpixbuf-png-out-plugin.c
+	* daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
+	* daemon/plugins/epeg-plugin.c
+	* daemon/hildon-thumbnail-plugin.c: Recording the error message
+
 2009-05-19  Philip Van Hoof  <pvanhoof at codeminded.be>
 
 	* daemon/hildon-thumbnail-daemon.c

Modified: projects/haf/trunk/hildon-thumbnail/config.h.in
===================================================================
--- projects/haf/trunk/hildon-thumbnail/config.h.in	2009-05-25 10:34:54 UTC (rev 18476)
+++ projects/haf/trunk/hildon-thumbnail/config.h.in	2009-05-25 11:33:30 UTC (rev 18477)
@@ -51,6 +51,10 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Define to 1 if your C compiler doesn't accept -c and -o together. */
 #undef NO_MINUS_C_MINUS_O
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2009-05-25 10:34:54 UTC (rev 18476)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2009-05-25 11:33:30 UTC (rev 18477)
@@ -33,10 +33,10 @@
 typedef gboolean (*StopFunc) (void);
 typedef gchar * (*GetOrigFunc) (const gchar *path);
 typedef void (*CleanupFunc) (const gchar *uri_match, guint64 max_mtime);
-typedef void (*PutFunc) (guint64 mtime, const gchar *uri);
+typedef void (*PutFunc) (guint64 mtime, const gchar *uri, GError *error);
 
 void
-hildon_thumbnail_outplugins_put_error (guint64 mtime, const gchar *uri)
+hildon_thumbnail_outplugins_put_error (guint64 mtime, const gchar *uri, GError *error)
 {
 	GList *copy;
 
@@ -51,7 +51,7 @@
 			IsActiveFunc isac_func;
 			if (g_module_symbol (module, "hildon_thumbnail_outplugin_is_active", (gpointer *) &isac_func)) {
 				if (isac_func ()) {
-					put_func (mtime, uri);
+					put_func (mtime, uri, error);
 				} 
 			} 
 		}

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2009-05-25 10:34:54 UTC (rev 18476)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2009-05-25 11:33:30 UTC (rev 18477)
@@ -77,7 +77,7 @@
 
 void        hildon_thumbnail_outplugins_cleanup   (const gchar *uri_match, 
 						   guint since);
-void        hildon_thumbnail_outplugins_put_error (guint64 mtime, const gchar *uri);
+void        hildon_thumbnail_outplugins_put_error (guint64 mtime, const gchar *uri, GError *error);
 
 
 G_END_DECLS

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2009-05-25 10:34:54 UTC (rev 18476)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/epeg-plugin.c	2009-05-25 11:33:30 UTC (rev 18477)
@@ -568,6 +568,21 @@
 				errors = g_string_new ("");
 			g_string_append_printf (errors, "[`%s': %s] ", 
 								    uri, msg);
+			if (!err_file) {
+				GFile *file;
+				GFileInfo *info;
+				file = g_file_new_for_uri (uri);
+				info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
+							  G_FILE_QUERY_INFO_NONE,
+							  NULL, NULL);
+				if (info) {
+					guint64 mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+					hildon_thumbnail_outplugins_put_error (mtime, uri, nerror);
+					g_object_unref (info);
+				}
+
+				g_object_unref (file);
+			}
 			failed = g_list_prepend (failed, g_strdup (uri));
 			g_free (msg);
 		}
@@ -592,25 +607,11 @@
 		t = 0;
 
 		while (copy) {
-			GFile *file;
-			GFileInfo *info;
-
 			furis[t] = copy->data;
-
-			file = g_file_new_for_uri (furis[t]);
-			info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
-						  G_FILE_QUERY_INFO_NONE,
-						  NULL, NULL);
-			if (info) {
-				guint64 mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
-				hildon_thumbnail_outplugins_put_error (mtime, furis[t]);
-				g_object_unref (info);
-			}
-
-			g_object_unref (file);
 			copy = g_list_next (copy);
 			t++;
 		}
+
 		furis[t] = NULL;
 
 		*failed_uris = furis;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2009-05-25 10:34:54 UTC (rev 18476)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2009-05-25 11:33:30 UTC (rev 18477)
@@ -338,7 +338,7 @@
 						  NULL, NULL);
 			if (info) {
 				guint64 mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
-				hildon_thumbnail_outplugins_put_error (mtime, furis[t]);
+				hildon_thumbnail_outplugins_put_error (mtime, furis[t], NULL);
 				g_object_unref (info);
 			}
 

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-25 10:34:54 UTC (rev 18476)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2009-05-25 11:33:30 UTC (rev 18477)
@@ -244,11 +244,11 @@
 
 
 void
-hildon_thumbnail_outplugin_put_error (guint64 mtime, const gchar *uri)
+hildon_thumbnail_outplugin_put_error (guint64 mtime, const gchar *uri, GError *error_)
 {
 	gchar *large, *normal, *cropped, *filenp, *dirn;
 	GFile *parent, *file, *fail_file, *fail_dir;
-	GFileOutputStream *out;
+	GOutputStream *out;
 	struct utimbuf buf;
 	GError *error = NULL;
 
@@ -277,9 +277,16 @@
 
 	if (g_file_query_exists (fail_file, NULL))
 		g_file_delete (fail_file, NULL, NULL);
-	out = g_file_create (fail_file, 0, NULL, &error);
+	out = (GOutputStream*) g_file_create (fail_file, 0, NULL, &error);
 
 	if (out) {
+		gsize count;
+
+		if (error_)
+			g_output_stream_write_all (out, error_->message,
+						   strlen (error_->message),
+						   &count, NULL, NULL);
+
 		g_object_unref (out);
 	}
 
@@ -349,7 +356,7 @@
 	if (!nerror)
 		g_rename (temp, filen);
 	else
-		hildon_thumbnail_outplugin_put_error (mtime, uri);
+		hildon_thumbnail_outplugin_put_error (mtime, uri, nerror);
 
 	g_free (temp);
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2009-05-25 10:34:54 UTC (rev 18476)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2009-05-25 11:33:30 UTC (rev 18477)
@@ -292,6 +292,23 @@
 				errors = g_string_new ("");
 			g_string_append_printf (errors, "[`%s': %s] ", 
 						uri, nerror ? nerror->message:"Had error before");
+
+			if (!err_file) {
+				GFile *file;
+				GFileInfo *info;
+				file = g_file_new_for_uri (uri);
+				info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
+							  G_FILE_QUERY_INFO_NONE,
+							  NULL, NULL);
+				if (info) {
+					guint64 mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
+					hildon_thumbnail_outplugins_put_error (mtime, uri, nerror);
+					g_object_unref (info);
+				}
+
+				g_object_unref (file);
+			}
+
 			failed = g_list_prepend (failed, g_strdup (uri));
 			if (nerror)
 				g_error_free (nerror);
@@ -318,23 +335,7 @@
 		t = 0;
 
 		while (copy) {
-			GFile *file;
-			GFileInfo *info;
-
 			furis[t] = copy->data;
-
-			file = g_file_new_for_uri (furis[t]);
-			info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
-						  G_FILE_QUERY_INFO_NONE,
-						  NULL, NULL);
-			if (info) {
-				guint64 mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
-				hildon_thumbnail_outplugins_put_error (mtime, furis[t]);
-				g_object_unref (info);
-			}
-
-			g_object_unref (file);
-
 			copy = g_list_next (copy);
 			t++;
 		}

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-25 10:34:54 UTC (rev 18476)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2009-05-25 11:33:30 UTC (rev 18477)
@@ -266,11 +266,11 @@
 
 
 void
-hildon_thumbnail_outplugin_put_error (guint64 mtime, const gchar *uri)
+hildon_thumbnail_outplugin_put_error (guint64 mtime, const gchar *uri, GError *error_)
 {
 	gchar *large, *normal, *cropped, *filenp, *dirn;
 	GFile *parent, *file, *fail_file, *fail_dir;
-	GFileOutputStream *out;
+	GOutputStream *out;
 	struct utimbuf buf;
 	GError *error = NULL;
 
@@ -300,9 +300,16 @@
 
 	if (g_file_query_exists (fail_file, NULL))
 		g_file_delete (fail_file, NULL, NULL);
-	out = g_file_create (fail_file, 0, NULL, &error);
+	out = (GOutputStream *) g_file_create (fail_file, 0, NULL, &error);
 
 	if (out) {
+		gsize count;
+
+		if (error_)
+			g_output_stream_write_all (out, error_->message,
+						   strlen (error_->message),
+						   &count, NULL, NULL);
+
 		g_object_unref (out);
 	}
 
@@ -392,7 +399,7 @@
 		buf.actime = buf.modtime = mtime;
 		utime (filen, &buf);
 	} else {
-		hildon_thumbnail_outplugin_put_error (mtime, uri);
+		hildon_thumbnail_outplugin_put_error (mtime, uri, nerror);
 		g_propagate_error (error, nerror);
 	}