[maemo-commits] [maemo-commits] r16089 - in projects/haf/branches/hildon-thumbnail/daemonize: . daemon daemon/plugins

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-09-10 18:59:35 +0300 (Wed, 10 Sep 2008)
New Revision: 16089

Modified:
   projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-daemon.c
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-plugin.c
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-plugin.h
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.c
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/exec-plugin.c
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/gdkpixbuf-plugin.c
Log:
2008-09-10  Philip Van Hoof  <pvanhoof at gnome.org>

	* daemon/hildon-thumbnail-daemon.c
	* daemon/hildon-thumbnail-plugin.h
	* daemon/plugins/gdkpixbuf-plugin.c
	* daemon/plugins/exec-plugin.c
	* daemon/plugin-runner.c
	* daemon/hildon-thumbnail-plugin.c: Changed the init of plugins



Modified: projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog	2008-09-10 15:46:56 UTC (rev 16088)
+++ projects/haf/branches/hildon-thumbnail/daemonize/ChangeLog	2008-09-10 15:59:35 UTC (rev 16089)
@@ -1,5 +1,14 @@
 2008-09-10  Philip Van Hoof  <pvanhoof at gnome.org>
 
+	* daemon/hildon-thumbnail-daemon.c
+	* daemon/hildon-thumbnail-plugin.h
+	* daemon/plugins/gdkpixbuf-plugin.c
+	* daemon/plugins/exec-plugin.c
+	* daemon/plugin-runner.c
+	* daemon/hildon-thumbnail-plugin.c: Changed the init of plugins
+
+2008-09-10  Philip Van Hoof  <pvanhoof at gnome.org>
+
 	* thumbs/hildon-thumbnailer-wrap.sh
 	* thumbs/Makefile.am
 	* thumbs/thumber-register.c

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-daemon.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-daemon.c	2008-09-10 15:46:56 UTC (rev 16088)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-daemon.c	2008-09-10 15:59:35 UTC (rev 16089)
@@ -74,17 +74,9 @@
 			module = hildon_thumbnail_plugin_load ("gdkpixbuf");
 
 			hildon_thumbnail_plugin_do_init (module, &cropping,
+							 (register_func) thumbnailer_register_plugin,
+							 thumbnailer,
 							 &error);
-
-			supported = hildon_thumbnail_plugin_get_supported (module);
-			if (supported) {
-				while (supported[i] != NULL) {
-					thumbnailer_register_plugin (thumbnailer, 
-								     supported[i], 
-								     module);
-					i++;
-				}
-			}
 			y++;
 		}
 

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-plugin.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-plugin.c	2008-09-10 15:46:56 UTC (rev 16088)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-plugin.c	2008-09-10 15:59:35 UTC (rev 16089)
@@ -68,15 +68,15 @@
 }
 
 
-typedef void (*InitFunc) (gboolean *cropping, GError **error);
+typedef void (*InitFunc) (gboolean *cropping, register_func func, gpointer instance, GModule *module, GError **error);
 
 void
-hildon_thumbnail_plugin_do_init (GModule *module, gboolean *cropping, GError **error)
+hildon_thumbnail_plugin_do_init (GModule *module, gboolean *cropping, register_func in_func, gpointer instance, GError **error)
 {
 	InitFunc func;
 
 	if (g_module_symbol (module, "hildon_thumbnail_plugin_init", (gpointer *) &func)) {
-		(func) (cropping, error);
+		(func) (cropping, in_func, instance, module, error);
 	}
 }
 

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-plugin.h
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-plugin.h	2008-09-10 15:46:56 UTC (rev 16088)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-plugin.h	2008-09-10 15:59:35 UTC (rev 16089)
@@ -31,10 +31,14 @@
 
 G_BEGIN_DECLS
 
+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);
 void        hildon_thumbnail_plugin_do_init       (GModule *module, 
 						   gboolean *cropping,
+						   register_func func,
+						   gpointer self,
 						   GError **error);
 void        hildon_thumbnail_plugin_do_create     (GModule *module, 
 						   GStrv uris, 

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.c	2008-09-10 15:46:56 UTC (rev 16088)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugin-runner.c	2008-09-10 15:59:35 UTC (rev 16089)
@@ -188,7 +188,8 @@
 	DaemonPrivate *priv = DAEMON_GET_PRIVATE (object);
 	GModule *module = priv->module;
 
-	hildon_thumbnail_plugin_do_init (module, &priv->cropping, &error);
+	hildon_thumbnail_plugin_do_init (module, &priv->cropping, 
+					 NULL, NULL, &error);
 
 	if (!error && do_register) {
 		DBusGProxy *manager_proxy;

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/exec-plugin.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/exec-plugin.c	2008-09-10 15:46:56 UTC (rev 16088)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/exec-plugin.c	2008-09-10 15:59:35 UTC (rev 16089)
@@ -384,10 +384,12 @@
 }
 
 void 
-hildon_thumbnail_plugin_init (gboolean *cropping, GError **error)
+hildon_thumbnail_plugin_init (gboolean *cropping, register_func func, gpointer thumbnailer, GModule *module, GError **error)
 {
 	gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "exec-plugin.conf", NULL);
 	GFile *file = g_file_new_for_path (config);
+	guint i = 0;
+	const gchar **supported;
 
 	monitor =  g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL);
 
@@ -398,5 +400,15 @@
 
 	*cropping = do_cropped;
 
+	if (func) {
+		supported = hildon_thumbnail_plugin_supported ();
+		if (supported) {
+			while (supported[i] != NULL) {
+				func (thumbnailer, supported[i], module);
+				i++;
+			}
+		}
+	}
+
 	g_free (config);
 }

Modified: projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/gdkpixbuf-plugin.c
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/gdkpixbuf-plugin.c	2008-09-10 15:46:56 UTC (rev 16088)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/plugins/gdkpixbuf-plugin.c	2008-09-10 15:59:35 UTC (rev 16089)
@@ -398,10 +398,12 @@
 }
 
 void 
-hildon_thumbnail_plugin_init (gboolean *cropping, GError **error)
+hildon_thumbnail_plugin_init (gboolean *cropping, register_func func, gpointer thumbnailer, GModule *module, GError **error)
 {
 	gchar *config = g_build_filename (g_get_user_config_dir (), "hildon-thumbnailer", "gdkpixbuf-plugin.conf", NULL);
 	GFile *file = g_file_new_for_path (config);
+	guint i = 0;
+	const gchar **supported;
 
 	monitor =  g_file_monitor_file (file, G_FILE_MONITOR_NONE, NULL, NULL);
 
@@ -412,6 +414,16 @@
 
 	*cropping = do_cropped;
 
+	if (func) {
+		supported = hildon_thumbnail_plugin_supported ();
+		if (supported) {
+			while (supported[i] != NULL) {
+				func (thumbnailer, supported[i], module);
+				i++;
+			}
+		}
+	}
+
 	g_free (config);
 
 }