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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2008-09-24 18:05:23 +0300 (Wed, 24 Sep 2008)
New Revision: 16217

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
Log:
	* daemon/hildon-thumbnail-daemon.c (on_plugin_changed): Removed
	unused local variable 'modules'.

	* daemon/thumbnailer.c (WorkTask): Removed poolmax, it is unused.
	(thumbnailer_move, thumbnailer_copy): Correctly use to_uri for the
	target thumbnails.


Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-09-24 15:01:18 UTC (rev 16216)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-09-24 15:05:23 UTC (rev 16217)
@@ -1,3 +1,12 @@
+2008-09-24  Marius Vollmer  <marius.vollmer at nokia.com>
+
+	* daemon/hildon-thumbnail-daemon.c (on_plugin_changed): Removed
+	unused local variable 'modules'.
+
+	* daemon/thumbnailer.c (WorkTask): Removed poolmax, it is unused.
+	(thumbnailer_move, thumbnailer_copy): Correctly use to_uri for the
+	target thumbnails.
+
 2008-09-24  Philip Van Hoof  <pvanhoof at gnome.org>
 
 	* thumbs/hildon-thumbnail-factory.c: Performance improvement when a

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2008-09-24 15:01:18 UTC (rev 16216)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-daemon.c	2008-09-24 15:05:23 UTC (rev 16217)
@@ -121,7 +121,6 @@
 on_plugin_changed (GFileMonitor *monitor, GFile *file, GFile *other_file, GFileMonitorEvent event_type, gpointer user_data)
 {
 	Thumbnailer *thumbnailer = user_data;
-	GModule *module = NULL;
 	gchar *path = g_file_get_path (other_file);
 
 	if (path) {

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-09-24 15:01:18 UTC (rev 16216)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-09-24 15:05:23 UTC (rev 16217)
@@ -28,6 +28,7 @@
 #endif
 
 #include <glib.h>
+#include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib-bindings.h>
 
@@ -147,7 +148,6 @@
 	Thumbnailer *object;
 	GStrv urls;
 	guint num;
-	gboolean poolmax;
 	gboolean unqueued;
 } WorkTask;
 
@@ -197,9 +197,7 @@
 	task->num = ++num;
 	task->object = g_object_ref (object);
 	task->urls = g_strdupv (urls);
-	task->poolmax = FALSE;
 
-
 	g_mutex_lock (priv->mutex);
 	g_list_foreach (priv->tasks, (GFunc) mark_unqueued, (gpointer) handle_to_unqueue);
 	priv->tasks = g_list_prepend (priv->tasks, task);
@@ -439,7 +437,7 @@
 		if (nerror)
 			goto nerror_handler;
 
-		hildon_thumbnail_util_get_thumb_paths (from_uri, &to_large, 
+		hildon_thumbnail_util_get_thumb_paths (to_uri, &to_large, 
 						       &to_normal, 
 						       &to_cropped, &error);
 
@@ -511,7 +509,7 @@
 		if (nerror)
 			goto nerror_handler;
 
-		hildon_thumbnail_util_get_thumb_paths (from_uri, &to_s[0], 
+		hildon_thumbnail_util_get_thumb_paths (to_uri, &to_s[0], 
 						       &to_s[1], 
 						       &to_s[2], &error);