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

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-09-10 18:46:56 +0300 (Wed, 10 Sep 2008)
New Revision: 16088

Modified:
   projects/haf/branches/hildon-thumbnail/daemonize/Makefile.am
   projects/haf/branches/hildon-thumbnail/daemonize/config.h.in
   projects/haf/branches/hildon-thumbnail/daemonize/configure.ac
   projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-daemon.c
Log:
Compilation fixes

Modified: projects/haf/branches/hildon-thumbnail/daemonize/Makefile.am
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/Makefile.am	2008-09-10 13:38:51 UTC (rev 16087)
+++ projects/haf/branches/hildon-thumbnail/daemonize/Makefile.am	2008-09-10 15:46:56 UTC (rev 16088)
@@ -1,4 +1,4 @@
-SUBDIRS = thumbs daemon doc
+SUBDIRS = daemon thumbs doc
 
 EXTRA_DIST = debian/changelog debian/control debian/copyright debian/rules \
         debian/hildon-thumbnail.install \

Modified: projects/haf/branches/hildon-thumbnail/daemonize/config.h.in
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/config.h.in	2008-09-10 13:38:51 UTC (rev 16087)
+++ projects/haf/branches/hildon-thumbnail/daemonize/config.h.in	2008-09-10 15:46:56 UTC (rev 16088)
@@ -30,6 +30,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
 /* Name of package */
 #undef PACKAGE
 

Modified: projects/haf/branches/hildon-thumbnail/daemonize/configure.ac
===================================================================
--- projects/haf/branches/hildon-thumbnail/daemonize/configure.ac	2008-09-10 13:38:51 UTC (rev 16087)
+++ projects/haf/branches/hildon-thumbnail/daemonize/configure.ac	2008-09-10 15:46:56 UTC (rev 16088)
@@ -3,9 +3,11 @@
 AM_INIT_AUTOMAKE(hildon-thumbnail, 3.0.0)
 AM_CONFIG_HEADER(config.h)
 
+AC_PROG_CC
+AM_PROG_CC_C_O
+
 AC_CANONICAL_HOST
 
-AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 

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 13:38:51 UTC (rev 16087)
+++ projects/haf/branches/hildon-thumbnail/daemonize/daemon/hildon-thumbnail-daemon.c	2008-09-10 15:46:56 UTC (rev 16088)
@@ -54,9 +54,9 @@
 		Thumbnailer *thumbnailer;
 		DBusGProxy *manager_proxy;
 		GStrv supported;
-		guint i = 0;
+		guint i = 0, y = 0;
 		gboolean cropping;
-
+		const gchar *plugins[3] = { "gdkpixbuf", "exec", NULL};
 		/* TODO: dynamically load plugins, and detect when new ones get
 		 * dropped, and removed ones get removed (and therefore must
 		 * shut down) */
@@ -64,24 +64,28 @@
 		manager_do_init (connection, &manager, &error);
 		thumbnailer_do_init (connection, manager, &thumbnailer, &error);
 
-		module = hildon_thumbnail_plugin_load ("gdkpixbuf");
 
 		manager_proxy = dbus_g_proxy_new_for_name (connection, 
 					   MANAGER_SERVICE,
 					   MANAGER_PATH,
 					   MANAGER_INTERFACE);
 
-		hildon_thumbnail_plugin_do_init (module, &cropping,
-						 &error);
+		while (plugins[y] != NULL) {
+			module = hildon_thumbnail_plugin_load ("gdkpixbuf");
 
-		supported = hildon_thumbnail_plugin_get_supported (module);
-		if (supported) {
-			while (supported[i] != NULL) {
-				thumbnailer_register_plugin (thumbnailer, 
-							     supported[i], 
-							     module);
-				i++;
+			hildon_thumbnail_plugin_do_init (module, &cropping,
+							 &error);
+
+			supported = hildon_thumbnail_plugin_get_supported (module);
+			if (supported) {
+				while (supported[i] != NULL) {
+					thumbnailer_register_plugin (thumbnailer, 
+								     supported[i], 
+								     module);
+					i++;
+				}
 			}
+			y++;
 		}
 
 		main_loop = g_main_loop_new (NULL, FALSE);