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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-11-18 15:01:54 +0200 (Tue, 18 Nov 2008)
New Revision: 16736

Modified:
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
Log:
Bugfixes

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	2008-11-18 12:32:56 UTC (rev 16735)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-18 13:01:54 UTC (rev 16736)
@@ -74,10 +74,9 @@
 	}
 
 	if (db) {
-		gchar *sql = g_strdup_printf ("select Path from jpegthumbnails where URI LIKE '%s%' AND MTime <= %d",
+		gchar *sql = g_strdup_printf ("select Path from jpegthumbnails where URI LIKE '%s%%' and MTime <= '%Lu'",
 					      uri_match, since);
 		sqlite3_prepare_v2 (db, sql, -1, &stmt, NULL);
-		g_free (sql);
 
 		while (result == SQLITE_OK  || result == SQLITE_ROW || result == SQLITE_BUSY) {
 			gchar *dsql;
@@ -104,6 +103,7 @@
 			g_free (dsql);
 			g_unlink (path);
 		}
+		g_free (sql);
 	}
 #endif
 }
@@ -264,7 +264,7 @@
 					       filen);
 			sqlite3_exec (db, sql, callback, 0, NULL);
 			g_free (sql);
-			sql = g_strdup_printf ("insert into jpegthumbnails (Path, URI, MTime) values ('%s', '%s', %d)",
+			sql = g_strdup_printf ("insert into jpegthumbnails (Path, URI, MTime) values ('%s', '%s', %Lu)",
 					       filen, uri, mtime);
 			sqlite3_exec (db, sql, callback, 0, NULL);
 			g_free (sql);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-11-18 12:32:56 UTC (rev 16735)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-11-18 13:01:54 UTC (rev 16736)
@@ -896,6 +896,7 @@
 thumbnailer_cleanup (Thumbnailer *object, gchar *uri_match, guint64 since, DBusGMethodInvocation *context)
 {
 	hildon_thumbnail_outplugins_cleanup (uri_match, since);
+	dbus_g_method_return (context);
 }
 
 static void