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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Fri Mar 20 16:10:11 EET 2009 
Author: pvanhoof
Date: 2009-03-20 16:10:08 +0200 (Fri, 20 Mar 2009)
New Revision: 17763

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   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.h
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml
Log:
2009-03-20  Philip Van Hoof  <pvanhoof at codeminded.be>

        * daemon/plugins/gstreamer-video-plugin.c: Seeking 30 seconds into the
        video before making a thumbnail of the video.

        Fixes Bug# 92748

        * daemon/hildon-thumbnail-plugin.h
        * daemon/plugins/gdkpixbuf-png-out-plugin.c
        * daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
        * daemon/thumbnailer.c
        * daemon/thumbnailer.h
        * daemon/thumbnailer.xml
        * daemon/hildon-thumbnail-plugin.c: DBus API change for the 'since'
        parameter of cleanup



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-03-20 13:53:55 UTC (rev 17762)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2009-03-20 14:10:08 UTC (rev 17763)
@@ -5,6 +5,15 @@
 
 	Fixes Bug# 92748
 
+	* daemon/hildon-thumbnail-plugin.h
+	* daemon/plugins/gdkpixbuf-png-out-plugin.c
+	* daemon/plugins/gdkpixbuf-jpeg-out-plugin.c
+	* daemon/thumbnailer.c
+	* daemon/thumbnailer.h
+	* daemon/thumbnailer.xml
+	* daemon/hildon-thumbnail-plugin.c: DBus API change for the 'since'
+	parameter of cleanup
+
 2009-03-20  Philip Van Hoof  <pvanhoof at codeminded.be>
 
 	* config.h.in

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2009-03-20 13:53:55 UTC (rev 17762)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2009-03-20 14:10:08 UTC (rev 17763)
@@ -36,7 +36,7 @@
 
 gchar *
 hildon_thumbnail_outplugins_cleanup (const gchar *uri_match, 
-				     guint64 since)
+				     guint since)
 {
 	GList *copy;
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2009-03-20 13:53:55 UTC (rev 17762)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2009-03-20 14:10:08 UTC (rev 17763)
@@ -76,7 +76,7 @@
 gchar *     hildon_thumbnail_outplugins_get_orig  (const gchar *path);
 
 gchar *     hildon_thumbnail_outplugins_cleanup   (const gchar *uri_match, 
-						   guint64 since);
+						   guint 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	2009-03-20 13:53:55 UTC (rev 17762)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-jpeg-out-plugin.c	2009-03-20 14:10:08 UTC (rev 17763)
@@ -58,7 +58,7 @@
 #endif
 
 void
-hildon_thumbnail_outplugin_cleanup (const gchar *uri_match, guint64 since)
+hildon_thumbnail_outplugin_cleanup (const gchar *uri_match, guint since)
 {
 #ifdef HAVE_SQLITE3
 	sqlite3_stmt *stmt;
@@ -74,7 +74,7 @@
 	}
 
 	if (db) {
-		gchar *sql = g_strdup_printf ("select Path from jpegthumbnails where URI LIKE '%s%%' and MTime <= '%Lu'",
+		gchar *sql = g_strdup_printf ("select Path from jpegthumbnails where URI LIKE '%s%%' and MTime <= '%u'",
 					      uri_match, since);
 		sqlite3_prepare_v2 (db, sql, -1, &stmt, NULL);
 
@@ -99,7 +99,7 @@
 			g_unlink (path);
 		}
 		g_free (sql);
-		sql = g_strdup_printf ("delete from jpegthumbnails where URI LIKE '%s%%' and MTime <= '%Lu'",
+		sql = g_strdup_printf ("delete from jpegthumbnails where URI LIKE '%s%%' and MTime <= '%u'",
 					       uri_match, since);
 		sqlite3_exec (db, sql, callback, 0, NULL);
 		g_free (sql);

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-03-20 13:53:55 UTC (rev 17762)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-png-out-plugin.c	2009-03-20 14:10:08 UTC (rev 17763)
@@ -138,7 +138,7 @@
 
 
 static void
-cleanup (GDir *dir, const gchar *dirname, const gchar *uri_match, guint64 since)
+cleanup (GDir *dir, const gchar *dirname, const gchar *uri_match, guint since)
 {
 	const gchar *filen;
 	for (filen = g_dir_read_name (dir); filen; filen = g_dir_read_name (dir)) {
@@ -159,7 +159,7 @@
 }
 
 void
-hildon_thumbnail_outplugin_cleanup (const gchar *uri_match, guint64 max_mtime)
+hildon_thumbnail_outplugin_cleanup (const gchar *uri_match, guint max_mtime)
 {
 	GDir *dir;
 	gchar *dirname;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2009-03-20 13:53:55 UTC (rev 17762)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2009-03-20 14:10:08 UTC (rev 17763)
@@ -892,7 +892,7 @@
 }
 
 void
-thumbnailer_cleanup (Thumbnailer *object, gchar *uri_prefix, guint64 since, DBusGMethodInvocation *context)
+thumbnailer_cleanup (Thumbnailer *object, gchar *uri_prefix, guint since, DBusGMethodInvocation *context)
 {
 	hildon_thumbnail_outplugins_cleanup (uri_prefix, since);
 	dbus_g_method_return (context);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.h	2009-03-20 13:53:55 UTC (rev 17762)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.h	2009-03-20 14:10:08 UTC (rev 17763)
@@ -62,7 +62,7 @@
 void thumbnailer_move (Thumbnailer *object, GStrv from_urls, GStrv to_urls, DBusGMethodInvocation *context);
 void thumbnailer_copy (Thumbnailer *object, GStrv from_urls, GStrv to_urls, DBusGMethodInvocation *context);
 void thumbnailer_delete (Thumbnailer *object, GStrv urls, DBusGMethodInvocation *context);
-void thumbnailer_cleanup (Thumbnailer *object, gchar *uri_prefix, guint64 mtime, DBusGMethodInvocation *context);
+void thumbnailer_cleanup (Thumbnailer *object, gchar *uri_prefix, guint mtime, DBusGMethodInvocation *context);
 
 void thumbnailer_register_plugin (Thumbnailer *object, const gchar *mime_type, GModule *plugin, const GStrv uri_schemes, gint priority);
 void thumbnailer_unregister_plugin (Thumbnailer *object, GModule *plugin);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml	2009-03-20 13:53:55 UTC (rev 17762)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml	2009-03-20 14:10:08 UTC (rev 17763)
@@ -54,7 +54,7 @@
     <method name="Cleanup">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="s" name="uri_prefix" direction="in" />
-      <arg type="x" name="since" direction="in" />
+      <arg type="u" name="since" direction="in" />
     </method>
 
   </interface>
More information about the maemo-commits mailing list