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

Tue Oct 21 11:55:33 EEST 2008

Author: pvanhoof
Date: 2008-10-21 11:55:24 +0300 (Tue, 21 Oct 2008)
New Revision: 16445

Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/daemon/albumart.c
   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/manager.xml
   projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.xml
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnail-manager.c
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnail-manager.h
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.h
   projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
Log:
2008-10-21  Philip Van Hoof  <philip at codeminded.be>

	* thumbs/hildon-thumbnail-factory.c
	* thumbs/hildon-thumbnail-obj.c
	* daemon/hildon-thumbnail-plugin.h
	* daemon/thumbnail-manager.h
	* daemon/plugins/gdkpixbuf-plugin.c
	* daemon/plugins/exec-plugin.c
	* daemon/plugins/gstreamer-video-plugin.c
	* daemon/plugin-runner.c
	* daemon/albumart.c
	* daemon/thumbnailer.c
	* daemon/thumbnailer.h
	* daemon/plugin-runner.xml
	* daemon/manager.xml
	* daemon/thumbnailer.xml
	* daemon/hildon-thumbnail-plugin.c
	* daemon/thumbnail-manager.c: No more VFS_id stuff, adapted to new
	spec



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================

--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-10-21 08:55:24 UTC (rev 16445)
@@ -1,3 +1,23 @@
+2008-10-21  Philip Van Hoof  <philip at codeminded.be>
+
+	* thumbs/hildon-thumbnail-factory.c
+	* thumbs/hildon-thumbnail-obj.c
+	* daemon/hildon-thumbnail-plugin.h
+	* daemon/thumbnail-manager.h
+	* daemon/plugins/gdkpixbuf-plugin.c
+	* daemon/plugins/exec-plugin.c
+	* daemon/plugins/gstreamer-video-plugin.c
+	* daemon/plugin-runner.c
+	* daemon/albumart.c
+	* daemon/thumbnailer.c
+	* daemon/thumbnailer.h
+	* daemon/plugin-runner.xml
+	* daemon/manager.xml
+	* daemon/thumbnailer.xml
+	* daemon/hildon-thumbnail-plugin.c
+	* daemon/thumbnail-manager.c: No more VFS_id stuff, adapted to new
+	spec
+
 2008-10-17  Marius Vollmer  <marius.vollmer at nokia.com>
 
 	Released 3.0.6

Modified: projects/haf/trunk/hildon-thumbnail/daemon/albumart.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/albumart.c	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/albumart.c	2008-10-21 08:55:24 UTC (rev 16445)
@@ -156,7 +156,7 @@
 }
 
 #ifndef strcasestr
-char *
+static char *
 strcasestr (char *haystack, char *needle)
 {
 	char *p, *startn = 0, *np = 0;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.c	2008-10-21 08:55:24 UTC (rev 16445)
@@ -78,14 +78,14 @@
 	}
 }
 
-typedef void (*CreateFunc) (GStrv uris, gchar *mime_hint, gchar *VFS_id, GError **error);
+typedef void (*CreateFunc) (GStrv uris, gchar *mime_hint, GError **error);
 
 void 
-hildon_thumbnail_plugin_do_create (GModule *module, GStrv uris, gchar *mime_hint, gchar *VFS_id, GError **error)
+hildon_thumbnail_plugin_do_create (GModule *module, GStrv uris, gchar *mime_hint, GError **error)
 {
 	CreateFunc func;
 	if (g_module_symbol (module, "hildon_thumbnail_plugin_create", (gpointer *) &func)) {
-		(func) (uris, mime_hint, VFS_id, error);
+		(func) (uris, mime_hint, error);
 	}
 }
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/hildon-thumbnail-plugin.h	2008-10-21 08:55:24 UTC (rev 16445)
@@ -31,7 +31,7 @@
 
 G_BEGIN_DECLS
 
-typedef void (*register_func) (gpointer self, const gchar *mime_type, const gchar *VFS_id, GModule *module);
+typedef void (*register_func) (gpointer self, const gchar *mime_type, GModule *module);
 
 GModule *   hildon_thumbnail_plugin_load          (const gchar *module_name);
 GStrv       hildon_thumbnail_plugin_get_supported (GModule *module);
@@ -42,8 +42,7 @@
 						   GError **error);
 void        hildon_thumbnail_plugin_do_create     (GModule *module, 
 						   GStrv uris, 
-						   gchar *mime_hint, 
-						   gchar *VFS_id,
+						   gchar *mime_hint,
 						   GError **error);
 void        hildon_thumbnail_plugin_do_stop       (GModule *module);
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/manager.xml
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/manager.xml	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/manager.xml	2008-10-21 08:55:24 UTC (rev 16445)
@@ -4,7 +4,6 @@
     <method name="Register">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="s" name="mime_type" direction="in" />
-      <arg type="s" name="VFS_id" direction="in" />
     </method>
     <method name="GetSupported">
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.c	2008-10-21 08:55:24 UTC (rev 16445)
@@ -38,12 +38,6 @@
 #define DAEMON_CLASS(c)         (G_TYPE_CHECK_CLASS_CAST ((c), TYPE_DAEMON, DaemonClass))
 #define DAEMON_GET_CLASS(o)     (G_TYPE_INSTANCE_GET_CLASS ((o), TYPE_DAEMON, DaemonClass))
 
-static gchar *module_name;
-static gboolean dynamic_register = FALSE;
-static gchar *bus_name;
-static gchar *bus_path;
-static gint timeout = 600;
-
 typedef struct Daemon Daemon;
 typedef struct DaemonClass DaemonClass;
 
@@ -98,14 +92,14 @@
 }
 
 void 
-daemon_create (Daemon *object, GStrv uris, gchar *mime_hint, gchar *VFS_id, DBusGMethodInvocation *context)
+daemon_create (Daemon *object, GStrv uris, gchar *mime_hint, DBusGMethodInvocation *context)
 {
 	DaemonPrivate *priv = DAEMON_GET_PRIVATE (object);
 	GError *error = NULL;
 
 	keep_alive ();
 
-	hildon_thumbnail_plugin_do_create (priv->module, uris, mime_hint, VFS_id, &error);
+	hildon_thumbnail_plugin_do_create (priv->module, uris, mime_hint, &error);
 	if (error) {
 		dbus_g_method_return_error (context, error);
 		g_error_free (error);
@@ -216,13 +210,13 @@
 
 
 static void 
-daemon_register_func (gpointer self, const gchar *mime_type, const gchar *VFS_id, GModule *module)
+daemon_register_func (gpointer self, const gchar *mime_type, GModule *module)
 {
 	GError *nerror = NULL;
 
 	dbus_g_proxy_call (self, "Register",
 			   &nerror, G_TYPE_STRING,
-			   mime_type, VFS_id,
+			   mime_type,
 			   G_TYPE_INVALID,
 			   G_TYPE_INVALID);
 
@@ -245,7 +239,7 @@
 						   MANAGER_PATH,
 						   MANAGER_INTERFACE);
 
-	hildon_thumbnail_plugin_do_init (module, &priv->cropping,
+	hildon_thumbnail_plugin_do_init (module, &priv->cropping, 
 					 daemon_register_func, 
 					 manager_proxy, &error);
 
@@ -259,6 +253,11 @@
 
 }
 
+static gchar *module_name;
+static gboolean dynamic_register = FALSE;
+static gchar *bus_name;
+static gchar *bus_path;
+static gint timeout = 600;
 
 static GOptionEntry entries_daemon[] = {
 	{ "module-name", 'm', G_OPTION_FLAG_REVERSE|G_OPTION_FLAG_OPTIONAL_ARG, 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.xml
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.xml	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugin-runner.xml	2008-10-21 08:55:24 UTC (rev 16445)
@@ -5,7 +5,6 @@
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="as" name="uris" direction="in" />
       <arg type="s" name="mime_hint" direction="in" />
-      <arg type="s" name="VFS_id" direction="in" />
     </method>
   </interface>
 </node>

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/exec-plugin.c	2008-10-21 08:55:24 UTC (rev 16445)
@@ -234,7 +234,7 @@
 
 
 void
-hildon_thumbnail_plugin_create (GStrv uris, gchar *mime_hint, gchar *VFS_id, GError **error)
+hildon_thumbnail_plugin_create (GStrv uris, gchar *mime_hint, GError **error)
 {
 	guint i = 0;
 	GString *errors = NULL;
@@ -399,7 +399,7 @@
 		supported = hildon_thumbnail_plugin_supported ();
 		if (supported) {
 			while (supported[i] != NULL) {
-				func (thumbnailer, supported[i], "GIO", module);
+				func (thumbnailer, supported[i], module);
 				i++;
 			}
 		}

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gdkpixbuf-plugin.c	2008-10-21 08:55:24 UTC (rev 16445)
@@ -206,7 +206,7 @@
 }
 
 void
-hildon_thumbnail_plugin_create (GStrv uris, gchar *mime_hint, gchar *VFS_id, GError **error)
+hildon_thumbnail_plugin_create (GStrv uris, gchar *mime_hint, GError **error)
 {
 	guint i = 0;
 	GString *errors = NULL;
@@ -408,7 +408,7 @@
 		supported = hildon_thumbnail_plugin_supported ();
 		if (supported) {
 			while (supported[i] != NULL) {
-				func (thumbnailer, supported[i], "GIO", module);
+				func (thumbnailer, supported[i], module);
 				i++;
 			}
 		}

Modified: projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/plugins/gstreamer-video-plugin.c	2008-10-21 08:55:24 UTC (rev 16445)
@@ -48,6 +48,7 @@
 
 static gchar *supported[] = { "video/mp4", "video/mpeg", NULL };
 static gboolean do_cropped = TRUE;
+static gboolean do_vidthumbs = TRUE;
 static GFileMonitor *monitor = NULL;
 
 typedef struct {
@@ -419,7 +420,7 @@
 }
 
 void
-hildon_thumbnail_plugin_create (GStrv uris, gchar *mime_hint, gchar *VFS_id, GError **error)
+hildon_thumbnail_plugin_create (GStrv uris, gchar *mime_hint, GError **error)
 {
 	VideoThumbnailer *thumber;
 	gchar *large    = NULL;
@@ -502,6 +503,8 @@
 	}
 
 	do_cropped = g_key_file_get_boolean (keyfile, "Hildon Thumbnailer", "DoCropping", NULL);
+	do_vidthumbs = g_key_file_get_boolean (keyfile, "Hildon Thumbnailer", "DoVideoThumbnails", NULL);
+
 	g_key_file_free (keyfile);
 }
 
@@ -540,7 +543,7 @@
 		supported = hildon_thumbnail_plugin_supported ();
 		if (supported) {
 			while (supported[i] != NULL) {
-				func (thumbnailer, supported[i], "GIO", module);
+				func (thumbnailer, supported[i], module);
 				i++;
 			}
 		}

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnail-manager.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnail-manager.c	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnail-manager.c	2008-10-21 08:55:24 UTC (rev 16445)
@@ -58,28 +58,22 @@
 };
 
 DBusGProxy*
-thumbnail_manager_get_handler (ThumbnailManager *object, const gchar *mime_type, const gchar *VFS_id)
+thumbnail_manager_get_handler (ThumbnailManager *object, const gchar *mime_type)
 {
 	ThumbnailManagerPrivate *priv = THUMBNAIL_MANAGER_GET_PRIVATE (object);
 	DBusGProxy *proxy;
-	gchar *query = NULL;
 
-	if (VFS_id)
-		query = g_strdup_printf ("%s-%s", mime_type, VFS_id);
-
 	g_mutex_lock (priv->mutex);
-	proxy = g_hash_table_lookup (priv->handlers, query?query:mime_type);
+	proxy = g_hash_table_lookup (priv->handlers, mime_type);
 	if (proxy)
 		g_object_ref (proxy);
 	g_mutex_unlock (priv->mutex);
 
-	g_free (query);
-
 	return proxy;
 }
 
 static void
-thumbnail_manager_add (ThumbnailManager *object, gchar *key, gchar *name)
+thumbnail_manager_add (ThumbnailManager *object, gchar *mime_type, gchar *name)
 {
 	ThumbnailManagerPrivate *priv = THUMBNAIL_MANAGER_GET_PRIVATE (object);
 	DBusGProxy *mime_proxy;
@@ -101,7 +95,7 @@
 	g_free (path);
 
 	g_hash_table_replace (priv->handlers, 
-			      g_strdup (key),
+			      g_strdup (mime_type),
 			      mime_proxy);
 
 }
@@ -142,9 +136,9 @@
 		GKeyFile *keyfile;
 		gchar *fullfilen;
 		gchar *value;
-		GStrv values, VFS_ids;
-		GList *all = NULL, *copy;
+		GStrv values;
 		GError *error = NULL;
+		guint i = 0;
 		guint64 mtime;
 		GFileInfo *info;
 		GFile *file;
@@ -187,29 +181,6 @@
 			continue;
 		}
 
-		VFS_ids = g_key_file_get_string_list (keyfile, "D-BUS Thumbnailer", "SupportedVFS", NULL, NULL);
-
-		if (VFS_ids) {
-			guint t = 0, y;
-			while (VFS_ids[t] != NULL) {
-				y = 0;
-				while (values[y] != NULL) {
-					gchar *key = g_strdup_printf ("%s-%s", values[y], VFS_ids[t]);
-					all = g_list_prepend (all, key);
-					y++;
-				}
-				t++;
-			}
-			g_strfreev (VFS_ids);
-		} else {
-				guint y = 0;
-				while (values[y] != NULL) {
-					gchar *key = g_strdup (values[y]);
-					all = g_list_prepend (all, key);
-					y++;
-				}
-		}
-
 		/* Else, get the modificiation time, we'll need it later */
 
 		file = g_file_new_for_path (fullfilen);
@@ -237,12 +208,10 @@
 
 		/* And register it in the temporary hashtable that is being formed */
 
-		copy = all;
-
-		while (copy) {
+		while (values[i] != NULL) {
 			ValueInfo *info;
 
-			info = g_hash_table_lookup (pre, copy->data);
+			info = g_hash_table_lookup (pre, values[i]);
 
 			if (!info || info->mtime < mtime) {
 
@@ -262,16 +231,13 @@
 				info->prio = FALSE;
 
 				g_hash_table_replace (pre, 
-						      g_strdup (copy->data), 
+						      g_strdup (values[i]), 
 						      info);
 			}
 
-			copy = g_list_next (copy);
+			i++;
 		}
 
-		g_list_foreach (all, (GFunc) g_free, NULL);
-		g_list_free (all);
-
 		if (info)
 			g_object_unref (info);
 		if (file)
@@ -296,18 +262,22 @@
 			guint i;
 
 			for (i = 0; i< length; i++) {
-
 				ValueInfo *info = g_slice_new (ValueInfo);
+
 				info->name = g_key_file_get_string (keyfile, mimes[i], "Name", NULL);
+
 				/* This is atm unused for items in overrides. */
+
 				info->mtime = time (NULL);
+
 				/* Items in overrides are prioritized. */
+
 				info->prio = TRUE;
+
 				g_hash_table_replace (pre, 
-							  g_strdup (mimes[i]), 
-							  info);
+						      g_strdup (mimes[i]), 
+						      info);
 			}
-
 			g_strfreev (mimes);
 		}
 
@@ -437,7 +407,7 @@
  * Consult thumbnail_manager.xml for more information about this custom spec addition. */
 
 void
-thumbnail_manager_register (ThumbnailManager *object, gchar *mime_type, gchar *VFS_id, DBusGMethodInvocation *context)
+thumbnail_manager_register (ThumbnailManager *object, gchar *mime_type, DBusGMethodInvocation *context)
 {
 	ThumbnailManagerPrivate *priv = THUMBNAIL_MANAGER_GET_PRIVATE (object);
 	DBusGProxy *mime_proxy;

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnail-manager.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnail-manager.h	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnail-manager.h	2008-10-21 08:55:24 UTC (rev 16445)
@@ -50,11 +50,11 @@
 #define manager_register thumbnail_manager_register
 #define manager_get_supported thumbnail_manager_get_supported
 
-void thumbnail_manager_register (ThumbnailManager *object, gchar *mime_type, gchar *VFS_id, DBusGMethodInvocation *context);
+void thumbnail_manager_register (ThumbnailManager *object, gchar *mime_type, DBusGMethodInvocation *context);
 void thumbnail_manager_get_supported (ThumbnailManager *object, DBusGMethodInvocation *context);
 
 void thumbnail_manager_i_have (ThumbnailManager *object, const gchar *mime_type);
-DBusGProxy* thumbnail_manager_get_handler (ThumbnailManager *object, const gchar *mime_type, const gchar *VFS_id);
+DBusGProxy* thumbnail_manager_get_handler (ThumbnailManager *object, const gchar *mime_type);
 
 void thumbnail_manager_do_stop (void);
 void thumbnail_manager_do_init (DBusGConnection *connection, ThumbnailManager **thumbnail_manager, GError **error);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.c	2008-10-21 08:55:24 UTC (rev 16445)
@@ -74,13 +74,13 @@
 static guint signals[LAST_SIGNAL] = { 0, };
 
 void 
-thumbnailer_register_plugin (Thumbnailer *object, const gchar *mime_type, const gchar *VFS_id, GModule *plugin)
+thumbnailer_register_plugin (Thumbnailer *object, const gchar *mime_type, GModule *plugin)
 {
 	ThumbnailerPrivate *priv = THUMBNAILER_GET_PRIVATE (object);
 
 	g_mutex_lock (priv->mutex);
 	g_hash_table_insert (priv->plugins, 
-			     VFS_id?g_strdup_printf ("%s-%s", mime_type, VFS_id):g_strdup (mime_type), 
+			     g_strdup (mime_type), 
 			     plugin);
 	thumbnail_manager_i_have (priv->manager, mime_type);
 	g_mutex_unlock (priv->mutex);
@@ -151,7 +151,6 @@
 typedef struct {
 	Thumbnailer *object;
 	GStrv urls, mime_types;
-	gchar *VFS_id;
 	guint num;
 	gboolean unqueued;
 } WorkTask;
@@ -188,7 +187,7 @@
 }
 
 void
-thumbnailer_queue (Thumbnailer *object, GStrv urls, GStrv mime_hints, gchar *VFS_id, guint handle_to_unqueue, DBusGMethodInvocation *context)
+thumbnailer_queue (Thumbnailer *object, GStrv urls, GStrv mime_hints, guint handle_to_unqueue, DBusGMethodInvocation *context)
 {
 	ThumbnailerPrivate *priv = THUMBNAILER_GET_PRIVATE (object);
 	WorkTask *task;
@@ -213,11 +212,6 @@
 	else
 		task->mime_types = NULL;
 
-	if (VFS_id)
-		task->VFS_id = g_strdup (VFS_id);
-	else
-		task->VFS_id = NULL;
-
 	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);
@@ -246,7 +240,6 @@
 	GHashTable *hash;
 	GStrv urls = task->urls;
 	GStrv mime_types = task->mime_types;
-	gchar *VFS_id = task->VFS_id;
 	guint i;
 	GHashTableIter iter;
 	gpointer key, value;
@@ -347,7 +340,7 @@
 		/* If we have a third party thumbnailer for this mime-type, we
 		 * proxy the call */
 
-		proxy = thumbnail_manager_get_handler (priv->manager, mime_type, VFS_id);
+		proxy = thumbnail_manager_get_handler (priv->manager, mime_type);
 		if (proxy) {
 			GError *error = NULL;
 
@@ -356,7 +349,6 @@
 			dbus_g_proxy_call (proxy, "Create", &error, 
 					   G_TYPE_STRV, urlss,
 					   G_TYPE_STRING, mime_type,
-					   G_TYPE_STRING, VFS_id,
 					   G_TYPE_INVALID, 
 					   G_TYPE_INVALID);
 
@@ -378,13 +370,8 @@
 
 		} else {
 			GModule *module;
-			gchar *query = NULL;
-
-			if (VFS_id)
-				query = g_strdup_printf ("%s-%s", mime_type, VFS_id);
-
 			g_mutex_lock (priv->mutex);
-			module = g_hash_table_lookup (priv->plugins, query?query:key);
+			module = g_hash_table_lookup (priv->plugins, key);
 			g_mutex_unlock (priv->mutex);
 
 			if (module) {
@@ -392,7 +379,7 @@
 
 				keep_alive ();
 
-				hildon_thumbnail_plugin_do_create (module, urlss, mime_type, VFS_id, &error);
+				hildon_thumbnail_plugin_do_create (module, urlss, mime_type, &error);
 
 				keep_alive ();
 
@@ -431,7 +418,6 @@
 	g_strfreev (task->urls);
 	if (task->mime_types)
 		g_strfreev (task->mime_types);
-	g_free (task->VFS_id);
 
 	g_slice_free (WorkTask, task);
 

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.h
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.h	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.h	2008-10-21 08:55:24 UTC (rev 16445)
@@ -57,13 +57,13 @@
 
 GType thumbnailer_get_type (void);
 
-void thumbnailer_queue (Thumbnailer *object, GStrv urls, GStrv mime_hints, gchar *VFS_id, guint handle_to_unqueue, DBusGMethodInvocation *context);
+void thumbnailer_queue (Thumbnailer *object, GStrv urls, GStrv mime_hints, guint handle_to_unqueue, DBusGMethodInvocation *context);
 void thumbnailer_unqueue (Thumbnailer *object, guint handle, DBusGMethodInvocation *context);
 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_register_plugin (Thumbnailer *object, const gchar *mime_type, const gchar *VFS_id, GModule *plugin);
+void thumbnailer_register_plugin (Thumbnailer *object, const gchar *mime_type, GModule *plugin);
 void thumbnailer_unregister_plugin (Thumbnailer *object, GModule *plugin);
 
 void thumbnailer_do_stop (void);

Modified: projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml
===================================================================
--- projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer.xml	2008-10-21 08:55:24 UTC (rev 16445)
@@ -6,7 +6,6 @@
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="as" name="uris" direction="in" />
       <arg type="as" name="mime_hints" direction="in" />
-      <arg type="s" name="VFS_id" direction="in" />
       <arg type="u" name="handle_to_unqueue" direction="in" />
       <arg type="u" name="handle" direction="out" />
     </method>

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c	2008-10-21 08:55:24 UTC (rev 16445)
@@ -426,7 +426,7 @@
 		org_freedesktop_thumbnailer_Generic_queue_async (proxy, 
 														 (const char **) uris, 
 														 (const char **) mimes,
-														 "GIO", 0, 
+														 0, 
 								 						 on_got_handle, item);
 
 		g_strfreev (uris);

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2008-10-20 14:24:56 UTC (rev 16444)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2008-10-21 08:55:24 UTC (rev 16445)
@@ -309,7 +309,7 @@
 		org_freedesktop_thumbnailer_Generic_queue_async (f_priv->proxy, 
 								 (const char **) r_priv->uris, 
 								 (const char **) mime_types,
-								 "GIO", 0, 
+								 0, 
 								 on_got_handle, 
 								 g_object_ref (request));
 	} else {


