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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-11-18 14:26:25 +0200 (Tue, 18 Nov 2008)
New Revision: 16732

Modified:
   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/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
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml
Log:
Bugfix and API clarity

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-18 12:23:47 UTC (rev 16731)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-11-18 12:26:25 UTC (rev 16732)
@@ -36,7 +36,7 @@
 
 gchar *
 hildon_thumbnail_outplugins_cleanup (const gchar *uri_match, 
-				     guint64 max_mtime)
+				     guint64 since)
 {
 	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 ()) {
-					clean_func (uri_match, max_mtime);
+					clean_func (uri_match, since);
 				} 
 			} 
 		}

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-11-18 12:23:47 UTC (rev 16731)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-11-18 12:26:25 UTC (rev 16732)
@@ -75,7 +75,7 @@
 gchar *     hildon_thumbnail_outplugins_get_orig  (const gchar *path);
 
 gchar *     hildon_thumbnail_outplugins_cleanup   (const gchar *uri_match, 
-						   guint64 max_mtime);
+						   guint64 since);
 
 
 G_END_DECLS

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:23:47 UTC (rev 16731)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2008-11-18 12:26:25 UTC (rev 16732)
@@ -58,7 +58,7 @@
 #endif
 
 void
-hildon_thumbnail_outplugin_cleanup (const gchar *uri_match, guint64 max_mtime)
+hildon_thumbnail_outplugin_cleanup (const gchar *uri_match, guint64 since)
 {
 #ifdef HAVE_SQLITE3
 	sqlite3_stmt *stmt;
@@ -101,7 +101,7 @@
 			mtime = sqlite3_column_int64 (stmt, 1);
 			uri = sqlite3_column_text (stmt, 2);
 
-			if (mtime > max_mtime) {
+			if (mtime < since) {
 				sql = g_strdup_printf ("delete from jpegthumbnails where Path = '%s' and URI = '%s' and mtime = %d",
 						       path, mtime, uri);
 				sqlite3_exec (db, sql, callback, 0, NULL);

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	2008-11-18 12:23:47 UTC (rev 16731)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2008-11-18 12:26:25 UTC (rev 16732)
@@ -138,7 +138,7 @@
 
 
 static void
-cleanup (GDir *dir, const gchar *dirname, const gchar *uri_match, guint64 max_mtime)
+cleanup (GDir *dir, const gchar *dirname, const gchar *uri_match, guint64 since)
 {
 	const gchar *filen;
 	for (filen = g_dir_read_name (dir); filen; filen = g_dir_read_name (dir)) {
@@ -148,7 +148,7 @@
 			if (orig && g_str_has_prefix (orig, uri_match)) {
 				struct stat st;
 				g_stat (fulln, &st);
-				if (st.st_mtime > max_mtime) {
+				if (st.st_mtime <= since) {
 					g_unlink (fulln);
 				}
 				g_free (orig);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-11-18 12:23:47 UTC (rev 16731)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-11-18 12:26:25 UTC (rev 16732)
@@ -893,9 +893,9 @@
 }
 
 void
-thumbnailer_cleanup (Thumbnailer *object, gchar *uri_match, guint64 mtime, DBusGMethodInvocation *context)
+thumbnailer_cleanup (Thumbnailer *object, gchar *uri_match, guint64 since, DBusGMethodInvocation *context)
 {
-	hildon_thumbnail_outplugins_cleanup (uri_match, mtime);
+	hildon_thumbnail_outplugins_cleanup (uri_match, since);
 }
 
 static void

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml	2008-11-18 12:23:47 UTC (rev 16731)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml	2008-11-18 12:26:25 UTC (rev 16732)
@@ -54,7 +54,7 @@
     <method name="Cleanup">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="s" name="uri_match" direction="in" />
-      <arg type="x" name="max_mtime" direction="in" />
+      <arg type="x" name="since" direction="in" />
     </method>
 
   </interface>