[maemo-commits] [maemo-commits] r16576 - in projects/haf/trunk/hildon-thumbnail: . thumbs

[From: subversion at stage.maemo.org]

Author: pvanhoof
Date: 2008-11-04 19:55:32 +0200 (Tue, 04 Nov 2008)
New Revision: 16576

Added:
   projects/haf/trunk/hildon-thumbnail/thumbs/thumbnailer-marshal.list
Modified:
   projects/haf/trunk/hildon-thumbnail/ChangeLog
   projects/haf/trunk/hildon-thumbnail/thumbs/Makefile.am
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c
   projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
Log:
2008-11-04  Philip Van Hoof  <philip at codeminded.be>

	* thumbs/hildon-thumbnail-factory.c
	* thumbs/hildon-thumbnail-obj.c
	* thumbs/Makefile.am
	* thumbs/thumbnailer-marshal.list: Registering client-side marshallers
	for the Error signal



Modified: projects/haf/trunk/hildon-thumbnail/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-04 17:43:11 UTC (rev 16575)
+++ projects/haf/trunk/hildon-thumbnail/ChangeLog	2008-11-04 17:55:32 UTC (rev 16576)
@@ -1,6 +1,14 @@
 2008-11-04  Philip Van Hoof  <philip at codeminded.be>
 
+	* thumbs/hildon-thumbnail-factory.c
 	* thumbs/hildon-thumbnail-obj.c
+	* thumbs/Makefile.am
+	* thumbs/thumbnailer-marshal.list: Registering client-side marshallers
+	for the Error signal
+
+2008-11-04  Philip Van Hoof  <philip at codeminded.be>
+
+	* thumbs/hildon-thumbnail-obj.c
 	* tests/tests.c
 	* daemon/thumbnailer.c: More bugfixes in determining the path in the
 	new client API

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/Makefile.am	2008-11-04 17:43:11 UTC (rev 16575)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/Makefile.am	2008-11-04 17:55:32 UTC (rev 16576)
@@ -42,12 +42,20 @@
 	hildon-thumbnail-factory.h thumbnailer-client.h \
 	pixbuf-io-loader.c hildon-albumart-factory.c \
 	hildon-albumart-factory.h albumart-client.h \
-	hildon-thumbnail-obj.c hildon-albumart-obj.c
+	hildon-thumbnail-obj.c hildon-albumart-obj.c \
+	thumbnailer-marshal.c thumbnailer-marshal.h
 
+thumbnailer-marshal.h: thumbnailer-marshal.list
+	$(GLIB_GENMARSHAL) $< --prefix=thumbnailer_marshal --header > $@
+
+thumbnailer-marshal.c: thumbnailer-marshal.list
+	$(GLIB_GENMARSHAL) $< --prefix=thumbnailer_marshal --body > $@
+
 %-client.h: $(top_srcdir)/daemon/%.xml
 	$(DBUSBINDINGTOOL) --mode=glib-client --output=$@ --prefix=$(subst -,_,$*) $^
 
-BUILT_SOURCES = thumbnailer-client.h albumart-client.h
+BUILT_SOURCES = thumbnailer-client.h albumart-client.h \
+	thumbnailer-marshal.h thumbnailer-marshal.c
 
 libhildonthumbnaildir=$(includedir)/hildon-thumbnail
 libhildonthumbnail_HEADERS = hildon-thumbnail-factory.h hildon-thumber-common.h \

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c	2008-11-04 17:43:11 UTC (rev 16575)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-factory.c	2008-11-04 17:55:32 UTC (rev 16576)
@@ -25,6 +25,7 @@
 #include "hildon-thumbnail-factory.h"
 #include "hildon-thumber-common.h"
 #include "thumbnailer-client.h"
+#include "thumbnailer-marshal.h"
 #include "utils.h"
 
 #include <stdlib.h>
@@ -760,11 +761,21 @@
 
 		dbus_g_proxy_add_signal (proxy, "Finished", 
 					G_TYPE_UINT, G_TYPE_INVALID);
+
+		dbus_g_object_register_marshaller (thumbnailer_marshal_VOID__UINT_BOXED_INT_STRING,
+					G_TYPE_NONE,
+					G_TYPE_UINT, 
+					G_TYPE_BOXED,
+					G_TYPE_INT,
+					G_TYPE_STRING,
+					G_TYPE_INVALID);
+	
 		dbus_g_proxy_add_signal (proxy, "Error", 
 					G_TYPE_UINT, 
 					G_TYPE_BOXED,
 					G_TYPE_INT,
-					G_TYPE_STRING, G_TYPE_INVALID);
+					G_TYPE_STRING,
+					G_TYPE_INVALID);
 
 		dbus_g_proxy_connect_signal (proxy, "Finished",
 				     G_CALLBACK (on_task_finished),

Modified: projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c
===================================================================
--- projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2008-11-04 17:43:11 UTC (rev 16575)
+++ projects/haf/trunk/hildon-thumbnail/thumbs/hildon-thumbnail-obj.c	2008-11-04 17:55:32 UTC (rev 16576)
@@ -29,6 +29,7 @@
 
 #include "hildon-thumbnail-factory.h"
 #include "thumbnailer-client.h"
+#include "thumbnailer-marshal.h"
 #include "utils.h"
 
 #define THUMBNAILER_SERVICE      "org.freedesktop.thumbnailer"
@@ -324,6 +325,14 @@
 	dbus_g_proxy_add_signal (f_priv->proxy, "Finished", 
 				G_TYPE_UINT, G_TYPE_INVALID);
 
+	dbus_g_object_register_marshaller (thumbnailer_marshal_VOID__UINT_BOXED_INT_STRING,
+					G_TYPE_NONE,
+					G_TYPE_UINT, 
+					G_TYPE_BOXED,
+					G_TYPE_INT,
+					G_TYPE_STRING,
+					G_TYPE_INVALID);
+
 	dbus_g_proxy_connect_signal (f_priv->proxy, "Finished",
 			     G_CALLBACK (on_task_finished),
 			     self,
@@ -333,7 +342,8 @@
 				 G_TYPE_UINT, 
 				 G_TYPE_BOXED,
 				 G_TYPE_INT,
-				 G_TYPE_STRING, G_TYPE_INVALID);
+				 G_TYPE_STRING,
+				 G_TYPE_INVALID);
 
 	dbus_g_proxy_connect_signal (f_priv->proxy, "Error",
 			     G_CALLBACK (on_task_error),

Copied: projects/haf/trunk/hildon-thumbnail/thumbs/thumbnailer-marshal.list (from rev 16491, projects/haf/trunk/hildon-thumbnail/daemon/thumbnailer-marshal.list)