GNOME.org
 

[evolution-data-server/openismus-work] Added propagation of 'requested_fields' through the getBookView api in libegdbus.

commit e178fcc6b17f1d6ea522ddf0f8a56a1fa5cca63d
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Fri Jun 10 20:32:03 2011 +0900

    Added propagation of 'requested_fields' through the getBookView api in libegdbus.
    
    Changes imply:
       o Modified Makefile.am to use @EVO_MARSHAL_RULE@
       o Deleted the old committed copies of the marshaller files
       o Renamed e-egdbus-marshallers.list -> e-egdbus-marshal.list
         (for marshaller names like g_egdbus_marshal_VOID__INT...).
       o Updated EGdbusBook[Factory/View] to use the new generated marshaller names
       o Added new parameter 'requested_fields' to the getBookView gdbus api.
       o Modified e_book_get_book_view () to send an array of requested fields.

 addressbook/libebook/e-book.c                      |   47 +++-
 addressbook/libegdbus/Makefile.am                  |   12 +-
 addressbook/libegdbus/e-gdbus-egdbusbook.c         |   59 +++--
 addressbook/libegdbus/e-gdbus-egdbusbook.h         |    3 +
 addressbook/libegdbus/e-gdbus-egdbusbookfactory.c  |    4 +-
 addressbook/libegdbus/e-gdbus-egdbusbookview.c     |   18 +-
 ...gdbus-marshallers.list => e-gdbus-marshal.list} |    2 +-
 addressbook/libegdbus/e-gdbus-marshallers.c        |  343 --------------------
 addressbook/libegdbus/e-gdbus-marshallers.h        |   77 -----
 9 files changed, 101 insertions(+), 464 deletions(-)
---
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index b747bcc..fbfac59 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -1780,6 +1780,24 @@ e_book_remove_contacts_async (EBook              *book,
 	return TRUE;
 }
 
+static gchar **
+string_array_from_list (GList *list)
+{
+	gchar **array = NULL;
+	gint    size, i;
+	GList  *l;
+
+	if (list) {
+		size = g_list_length (list);
+		array = g_new0 (gchar *, size + 1);
+
+		for (l = list, i = 0; l; l = l->next, i++)
+			array[i] = (gchar *)l->data;
+	}
+
+	return array;
+}
+
 /**
  * e_book_get_book_view:
  * @book: an #EBook
@@ -1806,17 +1824,21 @@ e_book_get_book_view (EBook       *book,
 	GError *err = NULL;
 	EGdbusBookView *gdbus_bookview;
 	gchar *sexp, *view_path;
+	gchar **fields_array = NULL;
 	gboolean ret = TRUE;
 
 	e_return_error_if_fail (E_IS_BOOK (book), E_BOOK_ERROR_INVALID_ARG);
 	e_return_error_if_fail (book->priv->gdbus_book, E_BOOK_ERROR_REPOSITORY_OFFLINE);
 
-	sexp = e_book_query_to_string (query);
+	sexp         = e_book_query_to_string (query);
+	fields_array = string_array_from_list (requested_fields);
 
-	if (!e_gdbus_book_call_get_book_view_sync (book->priv->gdbus_book, sexp, max_results, &view_path, NULL, &err)) {
+	if (!e_gdbus_book_call_get_book_view_sync (book->priv->gdbus_book, sexp, 
+						   (const gchar * const *)fields_array, 
+						   max_results, &view_path, NULL, &err)) {
 		*book_view = NULL;
 		g_free (sexp);
-
+		g_free (fields_array);
 		return unwrap_gerror (err, error);
 	}
 
@@ -1838,6 +1860,7 @@ e_book_get_book_view (EBook       *book,
 
 	g_free (view_path);
 	g_free (sexp);
+	g_free (fields_array);
 
 	return ret;
 }
@@ -1911,6 +1934,7 @@ e_book_async_get_book_view (EBook                 *book,
 			    gpointer               closure)
 {
 	AsyncData *data;
+	gchar **fields_array = NULL;
 	gchar *sexp;
 
 	e_return_async_error_val_if_fail (E_IS_BOOK (book), E_BOOK_ERROR_INVALID_ARG);
@@ -1922,11 +1946,15 @@ e_book_async_get_book_view (EBook                 *book,
 	data->callback = cb;
 	data->closure = closure;
 
-	sexp = e_book_query_to_string (query);
+	sexp         = e_book_query_to_string (query);
+	fields_array = string_array_from_list (requested_fields);
 
-	e_gdbus_book_call_get_book_view (book->priv->gdbus_book, sexp, max_results, NULL, get_book_view_reply, data);
+	e_gdbus_book_call_get_book_view (book->priv->gdbus_book, sexp,
+					 (const gchar * const *)fields_array,
+					 max_results, NULL, get_book_view_reply, data);
 
 	g_free (sexp);
+	g_free (fields_array);
 	return 0;
 }
 #endif
@@ -1956,6 +1984,7 @@ e_book_get_book_view_async (EBook                      *book,
 			    gpointer                    closure)
 {
 	AsyncData *data;
+	gchar **fields_array = NULL;
 	gchar *sexp;
 
 	e_return_ex_async_error_val_if_fail (E_IS_BOOK (book), E_BOOK_ERROR_INVALID_ARG);
@@ -1967,11 +1996,15 @@ e_book_get_book_view_async (EBook                      *book,
 	data->excallback = cb;
 	data->closure = closure;
 
-	sexp = e_book_query_to_string (query);
+	sexp         = e_book_query_to_string (query);
+	fields_array = string_array_from_list (requested_fields);
 
-	e_gdbus_book_call_get_book_view (book->priv->gdbus_book, sexp, max_results, NULL, get_book_view_reply, data);
+	e_gdbus_book_call_get_book_view (book->priv->gdbus_book, sexp,
+					 (const gchar * const *)fields_array,
+					 max_results, NULL, get_book_view_reply, data);
 
 	g_free (sexp);
+	g_free (fields_array);
 
 	return TRUE;
 }
diff --git a/addressbook/libegdbus/Makefile.am b/addressbook/libegdbus/Makefile.am
index 8610649..5e2650f 100644
--- a/addressbook/libegdbus/Makefile.am
+++ b/addressbook/libegdbus/Makefile.am
@@ -1,3 +1,8 @@
+# The marshallers
+MARSHAL_GENERATED = e-gdbus-marshal.c e-gdbus-marshal.h
+ EVO_MARSHAL_RULE@
+
+
 GDBUS_XML_FILES =					\
 	../libedata-book/e-data-book-factory.xml	\
 	../libedata-book/e-data-book-view.xml		\
@@ -18,14 +23,13 @@ libegdbus_book_la_CPPFLAGS =			\
 	$(E_DATA_SERVER_CFLAGS)
 
 libegdbus_book_la_SOURCES =			\
+	$(MARSHAL_GENERATED)			\
 	e-gdbus-egdbusbook.h			\
 	e-gdbus-egdbusbook.c			\
 	e-gdbus-egdbusbookfactory.h		\
 	e-gdbus-egdbusbookfactory.c		\
 	e-gdbus-egdbusbookview.h		\
 	e-gdbus-egdbusbookview.c		\
-	e-gdbus-marshallers.h			\
-	e-gdbus-marshallers.c			\
 	e-gdbus-typemappers.h
 
 libegdbus_book_la_LIBADD =			\
@@ -33,6 +37,8 @@ libegdbus_book_la_LIBADD =			\
 
 libegdbus_book_la_LDFLAGS = $(NO_UNDEFINED)
 
-EXTRA_DIST = e-gdbus-marshallers.list
+BUILT_SOURCES = $(MARSHAL_GENERATED)
+CLEANFILES    = $(BUILT_SOURCES)
+EXTRA_DIST    = e-gdbus-marshal.list
 
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/libegdbus/e-gdbus-egdbusbook.c b/addressbook/libegdbus/e-gdbus-egdbusbook.c
index 43c5248..77f2222 100644
--- a/addressbook/libegdbus/e-gdbus-egdbusbook.c
+++ b/addressbook/libegdbus/e-gdbus-egdbusbook.c
@@ -56,7 +56,7 @@
 
 #include "e-gdbus-egdbusbook.h"
 #include "e-gdbus-typemappers.h"
-#include "e-gdbus-marshallers.h"
+#include "e-gdbus-marshal.h"
 
 typedef EGdbusBookIface EGdbusBookInterface;
 G_DEFINE_INTERFACE (EGdbusBook, e_gdbus_book, G_TYPE_OBJECT);
@@ -299,7 +299,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, writable),
                   NULL,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_VOID__BOOLEAN,
+                  e_gdbus_marshal_VOID__BOOLEAN,
                   G_TYPE_NONE,
                   1,
                   G_TYPE_BOOLEAN);
@@ -329,7 +329,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, connection),
                   NULL,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_VOID__BOOLEAN,
+                  e_gdbus_marshal_VOID__BOOLEAN,
                   G_TYPE_NONE,
                   1,
                   G_TYPE_BOOLEAN);
@@ -389,7 +389,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_open),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_BOOLEAN,
+                  e_gdbus_marshal_BOOLEAN__OBJECT_BOOLEAN,
                   G_TYPE_BOOLEAN,
                   2,
                   G_TYPE_DBUS_METHOD_INVOCATION,
@@ -414,7 +414,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_remove),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT,
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_DBUS_METHOD_INVOCATION);
@@ -439,7 +439,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_get_contact),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_STRING,
+                  e_gdbus_marshal_BOOLEAN__OBJECT_STRING,
                   G_TYPE_BOOLEAN,
                   2,
                   G_TYPE_DBUS_METHOD_INVOCATION,
@@ -465,7 +465,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_get_contact_list),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_STRING,
+                  e_gdbus_marshal_BOOLEAN__OBJECT_STRING,
                   G_TYPE_BOOLEAN,
                   2,
                   G_TYPE_DBUS_METHOD_INVOCATION,
@@ -493,7 +493,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_authenticate_user),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_STRING_STRING_STRING,
+                  e_gdbus_marshal_BOOLEAN__OBJECT_STRING_STRING_STRING,
                   G_TYPE_BOOLEAN,
                   4,
                   G_TYPE_DBUS_METHOD_INVOCATION,
@@ -521,7 +521,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_add_contact),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_STRING,
+                  e_gdbus_marshal_BOOLEAN__OBJECT_STRING,
                   G_TYPE_BOOLEAN,
                   2,
                   G_TYPE_DBUS_METHOD_INVOCATION,
@@ -547,7 +547,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_remove_contacts),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_BOXED,
+                  e_gdbus_marshal_BOOLEAN__OBJECT_BOXED,
                   G_TYPE_BOOLEAN,
                   2,
                   G_TYPE_DBUS_METHOD_INVOCATION,
@@ -573,7 +573,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_modify_contact),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_STRING,
+                  e_gdbus_marshal_BOOLEAN__OBJECT_STRING,
                   G_TYPE_BOOLEAN,
                   2,
                   G_TYPE_DBUS_METHOD_INVOCATION,
@@ -598,7 +598,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_get_static_capabilities),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT,
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_DBUS_METHOD_INVOCATION);
@@ -622,7 +622,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_get_required_fields),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT,
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_DBUS_METHOD_INVOCATION);
@@ -646,7 +646,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_get_supported_fields),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT,
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_DBUS_METHOD_INVOCATION);
@@ -670,7 +670,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_get_supported_auth_methods),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT,
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_DBUS_METHOD_INVOCATION);
@@ -696,11 +696,12 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_get_book_view),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_STRING_UINT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT_STRING_BOXED_UINT,
                   G_TYPE_BOOLEAN,
-                  3,
+                  4,
                   G_TYPE_DBUS_METHOD_INVOCATION,
                   G_TYPE_STRING,
+		  G_TYPE_STRV,
                   G_TYPE_UINT);
   /**
    * EGdbusBook::handle-get-changes:
@@ -723,7 +724,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_get_changes),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_STRING,
+                  e_gdbus_marshal_BOOLEAN__OBJECT_STRING,
                   G_TYPE_BOOLEAN,
                   2,
                   G_TYPE_DBUS_METHOD_INVOCATION,
@@ -748,7 +749,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_cancel_operation),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT,
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_DBUS_METHOD_INVOCATION);
@@ -772,7 +773,7 @@ e_gdbus_book_default_init (EGdbusBookIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookIface, handle_close),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT,
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_DBUS_METHOD_INVOCATION);
@@ -2138,6 +2139,7 @@ _out:
  * e_gdbus_book_call_get_book_view:
  * @proxy: A #EGdbusBook.
  * @in_query: Method parameter.
+ * @in_requested_fields: The requested vcard fields for the new view
  * @in_max_results: Method parameter.
  * @cancellable: A #GCancellable or %NULL.
  * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL if you don't care about the result of the method invocation.
@@ -2156,14 +2158,16 @@ _out:
 void e_gdbus_book_call_get_book_view (
         EGdbusBook *proxy,
         const gchar *in_query,
+	const gchar * const *in_requested_fields,
         guint in_max_results,
         GCancellable *cancellable,
         GAsyncReadyCallback callback,
         gpointer user_data)
 {
   GVariant *_params;
-  _params = g_variant_new ("(su)",
+  _params = g_variant_new ("(s^a&su)",
                            in_query,
+			   in_requested_fields,
                            in_max_results);
   g_dbus_proxy_call (G_DBUS_PROXY (proxy),
                      "getBookView",
@@ -2213,6 +2217,7 @@ _out:
  * e_gdbus_book_call_get_book_view_sync:
  * @proxy: A #EGdbusBook.
  * @in_query: Method parameter.
+ * @in_requested_fields: The requested vcard fields for the new view
  * @in_max_results: Method parameter.
  * @out_view: Return location for out parameter or %NULL. Free with g_free().
  * @cancellable: A #GCancellable or %NULL.
@@ -2229,6 +2234,7 @@ _out:
 gboolean e_gdbus_book_call_get_book_view_sync (
         EGdbusBook *proxy,
         const gchar *in_query,
+	const gchar * const *in_requested_fields,
         guint in_max_results,
         gchar **out_view,
         GCancellable *cancellable,
@@ -2237,8 +2243,9 @@ gboolean e_gdbus_book_call_get_book_view_sync (
   gboolean _ret = FALSE;
   GVariant *_params;
   GVariant *_result;
-  _params = g_variant_new ("(su)",
+  _params = g_variant_new ("(s^a&su)",
                            in_query,
+			   in_requested_fields,
                            in_max_results);
   _result = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
                                    "getBookView",
@@ -3359,6 +3366,13 @@ static const GDBusArgInfo e_gdbus_book_method_in_getBookView_query =
   (gchar *) "s",
   (GDBusAnnotationInfo **) NULL,
 };
+static const GDBusArgInfo e_gdbus_book_method_in_getBookView_requested_fields =
+{
+  -1,
+  (gchar *) "requested_fields",
+  (gchar *) "as",
+  (GDBusAnnotationInfo **) NULL,
+};
 static const GDBusArgInfo e_gdbus_book_method_in_getBookView_max_results =
 {
   -1,
@@ -3369,6 +3383,7 @@ static const GDBusArgInfo e_gdbus_book_method_in_getBookView_max_results =
 static const GDBusArgInfo * const e_gdbus_book_method_in_getBookView_arg_pointers[] =
 {
   &e_gdbus_book_method_in_getBookView_query,
+  &e_gdbus_book_method_in_getBookView_requested_fields,
   &e_gdbus_book_method_in_getBookView_max_results,
   NULL
 };
diff --git a/addressbook/libegdbus/e-gdbus-egdbusbook.h b/addressbook/libegdbus/e-gdbus-egdbusbook.h
index 767dbea..ad119c2 100644
--- a/addressbook/libegdbus/e-gdbus-egdbusbook.h
+++ b/addressbook/libegdbus/e-gdbus-egdbusbook.h
@@ -235,6 +235,7 @@ struct _EGdbusBookIface
         EGdbusBook *object,
         GDBusMethodInvocation *invocation,
         const gchar *in_query,
+	const gchar * const *in_requested_fields,
         guint in_max_results);
   gboolean (*handle_get_changes) (
         EGdbusBook *object,
@@ -478,6 +479,7 @@ gboolean e_gdbus_book_call_get_supported_auth_methods_sync (
 void e_gdbus_book_call_get_book_view (
         EGdbusBook *proxy,
         const gchar *in_query,
+	const gchar * const *in_requested_fields,
         guint in_max_results,
         GCancellable *cancellable,
         GAsyncReadyCallback callback,
@@ -492,6 +494,7 @@ gboolean e_gdbus_book_call_get_book_view_finish (
 gboolean e_gdbus_book_call_get_book_view_sync (
         EGdbusBook *proxy,
         const gchar *in_query,
+	const gchar * const *in_requested_fields,
         guint in_max_results,
         gchar **out_view,
         GCancellable *cancellable,
diff --git a/addressbook/libegdbus/e-gdbus-egdbusbookfactory.c b/addressbook/libegdbus/e-gdbus-egdbusbookfactory.c
index c7c4b1f..6fb7c16 100644
--- a/addressbook/libegdbus/e-gdbus-egdbusbookfactory.c
+++ b/addressbook/libegdbus/e-gdbus-egdbusbookfactory.c
@@ -56,7 +56,7 @@
 
 #include "e-gdbus-egdbusbookfactory.h"
 #include "e-gdbus-typemappers.h"
-#include "e-gdbus-marshallers.h"
+#include "e-gdbus-marshal.h"
 
 typedef EGdbusBookFactoryIface EGdbusBookFactoryInterface;
 G_DEFINE_INTERFACE (EGdbusBookFactory, e_gdbus_book_factory, G_TYPE_OBJECT);
@@ -152,7 +152,7 @@ e_gdbus_book_factory_default_init (EGdbusBookFactoryIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookFactoryIface, handle_get_book),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT_STRING,
+                  e_gdbus_marshal_BOOLEAN__OBJECT_STRING,
                   G_TYPE_BOOLEAN,
                   2,
                   G_TYPE_DBUS_METHOD_INVOCATION,
diff --git a/addressbook/libegdbus/e-gdbus-egdbusbookview.c b/addressbook/libegdbus/e-gdbus-egdbusbookview.c
index fe4eab4..37510d8 100644
--- a/addressbook/libegdbus/e-gdbus-egdbusbookview.c
+++ b/addressbook/libegdbus/e-gdbus-egdbusbookview.c
@@ -56,7 +56,7 @@
 
 #include "e-gdbus-egdbusbookview.h"
 #include "e-gdbus-typemappers.h"
-#include "e-gdbus-marshallers.h"
+#include "e-gdbus-marshal.h"
 
 typedef EGdbusBookViewIface EGdbusBookViewInterface;
 G_DEFINE_INTERFACE (EGdbusBookView, e_gdbus_book_view, G_TYPE_OBJECT);
@@ -371,7 +371,7 @@ e_gdbus_book_view_default_init (EGdbusBookViewIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookViewIface, contacts_added),
                   NULL,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_VOID__BOXED,
+                  e_gdbus_marshal_VOID__BOXED,
                   G_TYPE_NONE,
                   1,
                   G_TYPE_STRV);
@@ -401,7 +401,7 @@ e_gdbus_book_view_default_init (EGdbusBookViewIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookViewIface, contacts_changed),
                   NULL,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_VOID__BOXED,
+                  e_gdbus_marshal_VOID__BOXED,
                   G_TYPE_NONE,
                   1,
                   G_TYPE_STRV);
@@ -431,7 +431,7 @@ e_gdbus_book_view_default_init (EGdbusBookViewIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookViewIface, contacts_removed),
                   NULL,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_VOID__BOXED,
+                  e_gdbus_marshal_VOID__BOXED,
                   G_TYPE_NONE,
                   1,
                   G_TYPE_STRV);
@@ -461,7 +461,7 @@ e_gdbus_book_view_default_init (EGdbusBookViewIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookViewIface, status_message),
                   NULL,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_VOID__STRING,
+                  e_gdbus_marshal_VOID__STRING,
                   G_TYPE_NONE,
                   1,
                   G_TYPE_STRING);
@@ -492,7 +492,7 @@ e_gdbus_book_view_default_init (EGdbusBookViewIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookViewIface, complete),
                   NULL,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_VOID__UINT_STRING,
+                  e_gdbus_marshal_VOID__UINT_STRING,
                   G_TYPE_NONE,
                   2,
                   G_TYPE_UINT,
@@ -524,7 +524,7 @@ e_gdbus_book_view_default_init (EGdbusBookViewIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookViewIface, handle_start),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT,
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_DBUS_METHOD_INVOCATION);
@@ -548,7 +548,7 @@ e_gdbus_book_view_default_init (EGdbusBookViewIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookViewIface, handle_stop),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT,
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_DBUS_METHOD_INVOCATION);
@@ -572,7 +572,7 @@ e_gdbus_book_view_default_init (EGdbusBookViewIface *iface)
                   G_STRUCT_OFFSET (EGdbusBookViewIface, handle_dispose),
                   g_signal_accumulator_true_handled,
                   NULL,
-                  _e_gdbus_gdbus_cclosure_marshaller_BOOLEAN__OBJECT,
+                  e_gdbus_marshal_BOOLEAN__OBJECT,
                   G_TYPE_BOOLEAN,
                   1,
                   G_TYPE_DBUS_METHOD_INVOCATION);
diff --git a/addressbook/libegdbus/e-gdbus-marshallers.list b/addressbook/libegdbus/e-gdbus-marshal.list
similarity index 83%
rename from addressbook/libegdbus/e-gdbus-marshallers.list
rename to addressbook/libegdbus/e-gdbus-marshal.list
index 46f24d4..20e3a5d 100644
--- a/addressbook/libegdbus/e-gdbus-marshallers.list
+++ b/addressbook/libegdbus/e-gdbus-marshal.list
@@ -7,4 +7,4 @@ VOID:BOOLEAN
 BOOLEAN:OBJECT,BOOLEAN
 BOOLEAN:OBJECT,STRING,STRING,STRING
 BOOLEAN:OBJECT,BOXED
-BOOLEAN:OBJECT,STRING,UINT
+BOOLEAN:OBJECT,STRING,BOXED,UINT
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]