Merge lp:~rye/ubuntuone-client/add-marshallers into lp:ubuntuone-client

[Roman Yepishev]

[Vincenzo Di Somma (vds)]

What is this branch meant to do?

[Roman Yepishev (rye)]

> What is this branch meant to do?

Originally, some method arguments for syncdaemon calls were pretty simple. After some changes were introduced to syncdaemon code, these arguments became no longer valid.
They were replaced by more complex structures. It turned out, that glib does not have marshallers for such kind of object, therefore causing those signals to be trappable by nautilus plugin.

This branch adds missing marshallers signatures, adds target for Makefile to generate corresponding source and header files and adds code to ubuntuone-nautilus plugin to register these marshallers for those complex structures.

Additionally, this branch fixes the ShareCreateError-related bug #496713 as the only thing that was required was to have the correct marshaller registered for ShareCreateError signal callback.

[Roman Yepishev (rye)]

> They were replaced by more complex structures. It turned out, that glib does
> not have marshallers for such kind of object, therefore causing those signals
> to be trappable by nautilus plugin.

Should be:
It turned out that glib does not have marshallers for such kind of object, therefore causing those signals to be invisible for nautilus plugin.

[dobey (dobey)]

review: Approve

=== modified file 'nautilus/Makefile.am'
--- nautilus/Makefile.am	2009-06-03 20:30:50 +0000
+++ nautilus/Makefile.am	2009-12-18 00:41:13 +0000
@@ -1,3 +1,4 @@
+MARSHAL_PREFIX=ubuntuone_nautilus_marshal
 
 extensiondir = $(libdir)/nautilus/extensions-2.0
 
@@ -9,7 +10,16 @@
 	$(DBUS_CFLAGS)					\
 	$(NAUTILUS_CFLAGS)
 
+ubuntuone-marshallers.c: ubuntuone-marshallers.list
+	glib-genmarshal --body --prefix=$(MARSHAL_PREFIX) $< > $@
+
+ubuntuone-marshallers.h: ubuntuone-marshallers.list
+	glib-genmarshal --header --prefix=$(MARSHAL_PREFIX) $< > $@
+
+ubuntuone-nautilus.c: ubuntuone-marshallers.h
+
 libnautilus_ubuntuone_la_SOURCES =	\
+	ubuntuone-marshallers.c \
 	ubuntuone-nautilus.c
 
 libnautilus_ubuntuone_la_LDFLAGS = -no-undefined -avoid-version

=== added file 'nautilus/ubuntuone-marshallers.list'
--- nautilus/ubuntuone-marshallers.list	1970-01-01 00:00:00 +0000
+++ nautilus/ubuntuone-marshallers.list	2009-12-18 00:41:13 +0000
@@ -0,0 +1,4 @@
+# UploadFinished, DownloadFinished
+VOID:STRING,OBJECT
+# ShareCreateError
+VOID:OBJECT,STRING

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2009-12-14 20:59:00 +0000
+++ nautilus/ubuntuone-nautilus.c	2009-12-18 00:41:13 +0000
@@ -45,6 +45,9 @@
 #include <sys/types.h>
 #include <utime.h>
 
+/* The header is generated from ubuntuone-marshallers.list */
+#include "ubuntuone-marshallers.h"
+
 #define UBUNTUONE_TYPE_NAUTILUS  (ubuntuone_nautilus_get_type ())
 #define UBUNTUONE_NAUTILUS(o)    (G_TYPE_CHECK_INSTANCE_CAST ((o), UBUNTUONE_TYPE_NAUTILUS, UbuntuOneNautilus))
 
@@ -609,6 +612,24 @@
 			   NULL, G_TYPE_INVALID);
 #endif
 
+  /* Marshaller for UploadFinished and DownloadFinished signals */
+  dbus_g_object_register_marshaller (ubuntuone_nautilus_marshal_VOID__STRING_OBJECT,
+				     G_TYPE_NONE,
+				     G_TYPE_STRING,
+				     dbus_g_type_get_map ("GHashTable",
+					G_TYPE_STRING,
+					G_TYPE_STRING),
+				     G_TYPE_INVALID);
+
+  /* Marshaller for ShareCreateError signal */
+  dbus_g_object_register_marshaller (ubuntuone_nautilus_marshal_VOID__OBJECT_STRING,
+				     G_TYPE_NONE,
+				     dbus_g_type_get_map ("GHashTable",
+					G_TYPE_STRING,
+					G_TYPE_STRING),
+				     G_TYPE_STRING,
+				     G_TYPE_INVALID);
+
   dbus_g_proxy_add_signal (uon->u1_status, "StatusChanged",
 			   dbus_g_type_get_map ("GHashTable",
 						G_TYPE_STRING,