[evolution-data-server] Remove unused private EClient functions.



commit 378b44da257b21cd4e390a010e429591ba8017d0
Author: Matthew Barnes <mbarnes redhat com>
Date:   Mon Jan 28 21:31:18 2013 -0500

    Remove unused private EClient functions.

 libedataserver/e-client-private.h |   71 ---
 libedataserver/e-client.c         | 1093 -------------------------------------
 2 files changed, 0 insertions(+), 1164 deletions(-)
---
diff --git a/libedataserver/e-client-private.h b/libedataserver/e-client-private.h
index 826853e..931b406 100644
--- a/libedataserver/e-client-private.h
+++ b/libedataserver/e-client-private.h
@@ -29,85 +29,14 @@ G_BEGIN_DECLS
 void		e_client_set_capabilities	(EClient *client, const gchar *capabilities);
 void		e_client_set_readonly		(EClient *client, gboolean readonly);
 void		e_client_set_online		(EClient *client, gboolean is_online);
-guint32		e_client_register_op		(EClient *client, GCancellable *cancellable);
-void		e_client_unregister_op		(EClient *client, guint32 opid);
 
-void		e_client_emit_opened		(EClient *client, const GError *error);
 void		e_client_emit_backend_error	(EClient *client, const gchar *error_msg);
 void		e_client_emit_backend_died	(EClient *client);
 void		e_client_emit_backend_property_changed   (EClient *client, const gchar *prop_name, const gchar *prop_value);
 
 /* protected functions simplifying sync/async calls */
-void		e_client_finish_async_without_dbus (EClient *client, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data, gpointer soure_tag, gpointer op_res, GDestroyNotify destroy_op_res);
 GDBusProxy *	e_client_get_dbus_proxy		(EClient *client);
 
-void		e_client_proxy_return_async_error	(EClient *client, const GError *error, GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag);
-
-#define e_client_return_async_if_fail(_expr, _client, _callback, _user_data, _source_tag)	\
-	G_STMT_START {										\
-		if (!G_LIKELY (_expr)) {							\
-			GError *error;								\
-												\
-			error = g_error_new (							\
-				E_CLIENT_ERROR, E_CLIENT_ERROR_INVALID_ARG,			\
-				"file %s:%d: %s: assertion `%s' failed",			\
-				__FILE__, __LINE__, G_STRFUNC, # _expr);			\
-												\
-			g_log (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, "%s", error->message);	\
-												\
-			e_client_proxy_return_async_error (					\
-				_client, error, _callback, _user_data, _source_tag);		\
-												\
-			g_error_free (error);							\
-		}										\
-	} G_STMT_END
-
-typedef gboolean (* EClientProxyFinishVoidFunc)		(GDBusProxy *proxy, GAsyncResult *result, GError **error);
-typedef gboolean (* EClientProxyFinishBooleanFunc)	(GDBusProxy *proxy, GAsyncResult *result, gboolean *out_boolean, GError **error);
-typedef gboolean (* EClientProxyFinishStringFunc)	(GDBusProxy *proxy, GAsyncResult *result, gchar **out_string, GError **error);
-typedef gboolean (* EClientProxyFinishStrvFunc)		(GDBusProxy *proxy, GAsyncResult *result, gchar ***out_strv, GError **error);
-typedef gboolean (* EClientProxyFinishUintFunc)		(GDBusProxy *proxy, GAsyncResult *result, guint *out_uint, GError **error);
-
-void		e_client_proxy_call_void	(EClient *client, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag, void (*func) (GDBusProxy *proxy, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data), EClientProxyFinishVoidFunc finish_void, EClientProxyFinishBooleanFunc finish_boolean, EClientProxyFinishStringFunc finish_string, EClientProxyFinishStrvFunc finish_strv, EClientProxyFinishUintFunc finish_uint);
-void		e_client_proxy_call_boolean	(EClient *client, gboolean in_boolean, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag, void (*func) (GDBusProxy *proxy, gboolean in_boolean, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data), EClientProxyFinishVoidFunc finish_void, EClientProxyFinishBooleanFunc finish_boolean, EClientProxyFinishStringFunc finish_string, EClientProxyFinishStrvFunc finish_strv, EClientProxyFinishUintFunc finish_uint);
-void		e_client_proxy_call_string	(EClient *client, const gchar *in_string, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag, void (*func) (GDBusProxy *proxy, const gchar * in_string, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data), EClientProxyFinishVoidFunc finish_void, EClientProxyFinishBooleanFunc finish_boolean, EClientProxyFinishStringFunc finish_string, EClientProxyFinishStrvFunc finish_strv, EClientProxyFinishUintFunc finish_uint);
-void		e_client_proxy_call_strv	(EClient *client, const gchar * const *in_strv, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag, void (*func) (GDBusProxy *proxy, const gchar * const * in_strv, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data), EClientProxyFinishVoidFunc finish_void, EClientProxyFinishBooleanFunc finish_boolean, EClientProxyFinishStringFunc finish_string, EClientProxyFinishStrvFunc finish_strv, EClientProxyFinishUintFunc finish_uint);
-void		e_client_proxy_call_uint	(EClient *client, guint in_uint, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag, void (*func) (GDBusProxy *proxy, guint in_uint, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data), EClientProxyFinishVoidFunc finish_void, EClientProxyFinishBooleanFunc finish_boolean, EClientProxyFinishStringFunc finish_string, EClientProxyFinishStrvFunc finish_strv, EClientProxyFinishUintFunc finish_uint);
-
-void		e_client_proxy_call_string_with_res_op_data (EClient *client, const gchar *in_string, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data, gpointer source_tag, const gchar *res_op_data, void (*func) (GDBusProxy *proxy, const gchar * in_string, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data), EClientProxyFinishVoidFunc finish_void, EClientProxyFinishBooleanFunc finish_boolean, EClientProxyFinishStringFunc finish_string, EClientProxyFinishStrvFunc finish_strv, EClientProxyFinishUintFunc finish_uint);
-
-gboolean	e_client_proxy_call_finish_void		(EClient *client, GAsyncResult *result, GError **error, gpointer source_tag);
-gboolean	e_client_proxy_call_finish_boolean	(EClient *client, GAsyncResult *result, gboolean *out_boolean, GError **error, gpointer source_tag);
-gboolean	e_client_proxy_call_finish_string	(EClient *client, GAsyncResult *result, gchar **out_string, GError **error, gpointer source_tag);
-gboolean	e_client_proxy_call_finish_strv		(EClient *client, GAsyncResult *result, gchar ***out_strv, GError **error, gpointer source_tag);
-gboolean	e_client_proxy_call_finish_uint		(EClient *client, GAsyncResult *result, guint *out_uint, GError **error, gpointer source_tag);
-
-gboolean	e_client_proxy_call_sync_void__void		(EClient *client, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_void__boolean		(EClient *client, gboolean *out_boolean, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, gboolean *out_boolean, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_void__string		(EClient *client, gchar **out_string, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, gchar **out_string, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_void__strv		(EClient *client, gchar ***out_strv, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, gchar ***out_strv, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_void__uint		(EClient *client, guint *out_uint, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, guint *out_uint, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_boolean__void		(EClient *client, gboolean in_boolean, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, gboolean in_boolean, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_boolean__boolean	(EClient *client, gboolean in_boolean, gboolean *out_boolean, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, gboolean in_boolean, gboolean *out_boolean, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_boolean__string	(EClient *client, gboolean in_boolean, gchar **out_string, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, gboolean in_boolean, gchar **out_string, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_boolean__strv		(EClient *client, gboolean in_boolean, gchar ***out_strv, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, gboolean in_boolean, gchar ***out_strv, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_boolean__uint		(EClient *client, gboolean in_boolean, guint *out_uint, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, gboolean in_boolean, guint *out_uint, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_string__void		(EClient *client, const gchar *in_string, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, const gchar *in_string, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_string__boolean	(EClient *client, const gchar *in_string, gboolean *out_boolean, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, const gchar *in_string, gboolean *out_boolean, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_string__string		(EClient *client, const gchar *in_string, gchar **out_string, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, const gchar *in_string, gchar **out_string, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_string__strv		(EClient *client, const gchar *in_string, gchar ***out_strv, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, const gchar *in_string, gchar ***out_strv, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_string__uint		(EClient *client, const gchar *in_string, guint *out_uint, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, const gchar *in_string, guint *out_uint, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_strv__void		(EClient *client, const gchar * const *in_strv, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, const gchar * const *in_strv, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_strv__boolean		(EClient *client, const gchar * const *in_strv, gboolean *out_boolean, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, const gchar * const *in_strv, gboolean *out_boolean, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_strv__string		(EClient *client, const gchar * const *in_strv, gchar **out_string, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, const gchar * const *in_strv, gchar **out_string, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_strv__strv		(EClient *client, const gchar * const *in_strv, gchar ***out_strv, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, const gchar * const *in_strv, gchar ***out_strv, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_strv__uint		(EClient *client, const gchar * const *in_strv, guint *out_uint, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, const gchar * const *in_strv, guint *out_uint, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_uint__void		(EClient *client, guint in_uint, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, guint in_uint, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_uint__boolean		(EClient *client, guint in_uint, gboolean *out_boolean, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, guint in_uint, gboolean *out_boolean, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_uint__string		(EClient *client, guint in_uint, gchar **out_string, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, guint in_uint, gchar **out_string, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_uint__strv		(EClient *client, guint in_uint, gchar ***out_strv, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, guint in_uint, gchar ***out_strv, GCancellable *cancellable, GError **error));
-gboolean	e_client_proxy_call_sync_uint__uint		(EClient *client, guint in_uint, guint *out_uint, GCancellable *cancellable, GError **error, gboolean (*func) (GDBusProxy *proxy, guint in_uint, guint *out_uint, GCancellable *cancellable, GError **error));
-
 G_END_DECLS
 
 #endif /* E_CLIENT_PRIVATE_H */
diff --git a/libedataserver/e-client.c b/libedataserver/e-client.c
index c92b2a6..a69c8e2 100644
--- a/libedataserver/e-client.c
+++ b/libedataserver/e-client.c
@@ -1196,67 +1196,6 @@ e_client_cancel_all (EClient *client)
 	g_rec_mutex_unlock (&client->priv->ops_mutex);
 }
 
-guint32
-e_client_register_op (EClient *client,
-                      GCancellable *cancellable)
-{
-	guint32 opid;
-
-	g_return_val_if_fail (E_IS_CLIENT (client), 0);
-	g_return_val_if_fail (client->priv->ops != NULL, 0);
-	g_return_val_if_fail (cancellable != NULL, 0);
-
-	g_rec_mutex_lock (&client->priv->ops_mutex);
-
-	client->priv->last_opid++;
-	if (!client->priv->last_opid)
-		client->priv->last_opid++;
-
-	while (g_hash_table_lookup (client->priv->ops, GINT_TO_POINTER (client->priv->last_opid)))
-		client->priv->last_opid++;
-
-	g_return_val_if_fail (client->priv->last_opid != 0, 0);
-
-	opid = client->priv->last_opid;
-	g_hash_table_insert (client->priv->ops, GINT_TO_POINTER (opid), g_object_ref (cancellable));
-
-	g_rec_mutex_unlock (&client->priv->ops_mutex);
-
-	return opid;
-}
-
-void
-e_client_unregister_op (EClient *client,
-                        guint32 opid)
-{
-	g_return_if_fail (E_IS_CLIENT (client));
-	g_return_if_fail (client->priv->ops != NULL);
-
-	g_rec_mutex_lock (&client->priv->ops_mutex);
-	g_hash_table_remove (client->priv->ops, GINT_TO_POINTER (opid));
-	g_rec_mutex_unlock (&client->priv->ops_mutex);
-}
-
-void
-e_client_emit_opened (EClient *client,
-                      const GError *dbus_error)
-{
-	GError *local_error = NULL;
-
-	g_return_if_fail (E_IS_CLIENT (client));
-
-	if (dbus_error) {
-		local_error = g_error_copy (dbus_error);
-		e_client_unwrap_dbus_error (client, local_error, &local_error);
-	}
-
-	g_object_notify (G_OBJECT (client), "opened");
-	g_signal_emit (client, signals[OPENED], 0, local_error);
-
-	if (local_error)
-		g_error_free (local_error);
-}
-
 void
 e_client_emit_backend_error (EClient *client,
                              const gchar *error_msg)
@@ -2101,46 +2040,6 @@ e_client_util_parse_comma_strings (const gchar *strings)
 	return g_slist_reverse (strs_slist);
 }
 
-void
-e_client_finish_async_without_dbus (EClient *client,
-                                    GCancellable *cancellable,
-                                    GAsyncReadyCallback callback,
-                                    gpointer user_data,
-                                    gpointer source_tag,
-                                    gpointer op_res,
-                                    GDestroyNotify destroy_op_res)
-{
-	GCancellable *use_cancellable;
-	GSimpleAsyncResult *simple;
-	guint32 opid;
-
-	g_return_if_fail (E_IS_CLIENT (client));
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (source_tag != NULL);
-
-	use_cancellable = cancellable;
-	if (!use_cancellable)
-		use_cancellable = g_cancellable_new ();
-
-	opid = e_client_register_op (client, use_cancellable);
-	g_return_if_fail (opid > 0);
-
-	simple = g_simple_async_result_new (
-		G_OBJECT (client), callback, user_data, source_tag);
-
-	g_simple_async_result_set_check_cancellable (simple, cancellable);
-
-	g_simple_async_result_set_op_res_gpointer (
-		simple, op_res, destroy_op_res);
-
-	g_simple_async_result_complete_in_idle (simple);
-
-	g_object_unref (simple);
-
-	if (use_cancellable != cancellable)
-		g_object_unref (use_cancellable);
-}
-
 GDBusProxy *
 e_client_get_dbus_proxy (EClient *client)
 {
@@ -2274,995 +2173,3 @@ e_client_util_unwrap_dbus_error (GError *dbus_error,
 	return TRUE;
 }
 
-typedef struct _EClientAsyncOpData
-{
-	EClient *client;
-	guint32 opid;
-
-	gpointer source_tag;
-	gchar *res_op_data; /* optional string to set on a GAsyncResult object as "res-op-data" user data */
-	GAsyncReadyCallback callback;
-	gpointer user_data;
-
-	gboolean result; /* result of the finish function call */
-
-	/* only one can be non-NULL, and the type is telling which 'out' value is valid */
-	EClientProxyFinishVoidFunc finish_void;
-	EClientProxyFinishBooleanFunc finish_boolean;
-	EClientProxyFinishStringFunc finish_string;
-	EClientProxyFinishStrvFunc finish_strv;
-	EClientProxyFinishUintFunc finish_uint;
-
-	union {
-		gboolean val_boolean;
-		gchar *val_string;
-		gchar **val_strv;
-		guint val_uint;
-	} out;
-} EClientAsyncOpData;
-
-static void
-async_data_free (EClientAsyncOpData *async_data)
-{
-	g_return_if_fail (async_data != NULL);
-	g_return_if_fail (async_data->client != NULL);
-
-	e_client_unregister_op (async_data->client, async_data->opid);
-
-	if (async_data->finish_string)
-		g_free (async_data->out.val_string);
-	else if (async_data->finish_strv)
-		g_strfreev (async_data->out.val_strv);
-
-	g_object_unref (async_data->client);
-	g_free (async_data->res_op_data);
-	g_free (async_data);
-}
-
-static gboolean
-complete_async_op_in_idle_cb (gpointer user_data)
-{
-	GSimpleAsyncResult *simple = user_data;
-	gint run_main_depth;
-
-	g_return_val_if_fail (simple != NULL, FALSE);
-
-	run_main_depth = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (simple), "run-main-depth"));
-	if (run_main_depth < 1)
-		run_main_depth = 1;
-
-	/* do not receive in higher level than was initially run */
-	if (g_main_depth () > run_main_depth) {
-		return TRUE;
-	}
-
-	g_simple_async_result_complete (simple);
-	g_object_unref (simple);
-
-	return FALSE;
-}
-
-static void
-finish_async_op (EClientAsyncOpData *async_data,
-                 const GError *error,
-                 gboolean in_idle)
-{
-	GSimpleAsyncResult *simple;
-
-	g_return_if_fail (async_data != NULL);
-	g_return_if_fail (async_data->source_tag != NULL);
-	g_return_if_fail (async_data->client != NULL);
-
-	simple = g_simple_async_result_new (G_OBJECT (async_data->client), async_data->callback, async_data->user_data, async_data->source_tag);
-	g_simple_async_result_set_op_res_gpointer (simple, async_data, (GDestroyNotify) async_data_free);
-
-	if (async_data->res_op_data)
-		g_object_set_data_full (G_OBJECT (simple), "res-op-data", g_strdup (async_data->res_op_data), g_free);
-
-	if (error != NULL)
-		g_simple_async_result_set_from_error (simple, error);
-
-	if (in_idle) {
-		g_object_set_data (G_OBJECT (simple), "run-main-depth", GINT_TO_POINTER (g_main_depth ()));
-		g_idle_add (complete_async_op_in_idle_cb, simple);
-	} else {
-		g_simple_async_result_complete (simple);
-		g_object_unref (simple);
-	}
-}
-
-static void
-async_result_ready_cb (GObject *source_object,
-                       GAsyncResult *result,
-                       gpointer user_data)
-{
-	GError *error = NULL;
-	EClientAsyncOpData *async_data;
-	EClient *client;
-
-	g_return_if_fail (result != NULL);
-	g_return_if_fail (source_object != NULL);
-
-	async_data = user_data;
-	g_return_if_fail (async_data != NULL);
-	g_return_if_fail (async_data->client != NULL);
-
-	client = async_data->client;
-	g_return_if_fail (e_client_get_dbus_proxy (client) == G_DBUS_PROXY (source_object));
-
-	if (async_data->finish_void)
-		async_data->result = async_data->finish_void (G_DBUS_PROXY (source_object), result, &error);
-	else if (async_data->finish_boolean)
-		async_data->result = async_data->finish_boolean (G_DBUS_PROXY (source_object), result, &async_data->out.val_boolean, &error);
-	else if (async_data->finish_string)
-		async_data->result = async_data->finish_string (G_DBUS_PROXY (source_object), result, &async_data->out.val_string, &error);
-	else if (async_data->finish_strv)
-		async_data->result = async_data->finish_strv (G_DBUS_PROXY (source_object), result, &async_data->out.val_strv, &error);
-	else if (async_data->finish_uint)
-		async_data->result = async_data->finish_uint (G_DBUS_PROXY (source_object), result, &async_data->out.val_uint, &error);
-	else
-		g_warning ("%s: Do not know how to finish async operation", G_STRFUNC);
-
-	finish_async_op (async_data, error, FALSE);
-
-	if (error != NULL)
-		g_error_free (error);
-}
-
-static EClientAsyncOpData *
-prepare_async_data (EClient *client,
-                    GCancellable *cancellable,
-                    GAsyncReadyCallback callback,
-                    gpointer user_data,
-                    gpointer source_tag,
-                    gboolean error_report_only,
-                    EClientProxyFinishVoidFunc finish_void,
-                    EClientProxyFinishBooleanFunc finish_boolean,
-                    EClientProxyFinishStringFunc finish_string,
-                    EClientProxyFinishStrvFunc finish_strv,
-                    EClientProxyFinishUintFunc finish_uint,
-                    GDBusProxy **proxy,
-                    GCancellable **out_cancellable)
-{
-	EClientAsyncOpData *async_data;
-	GCancellable *use_cancellable;
-	guint32 opid;
-
-	g_return_val_if_fail (client != NULL, NULL);
-	g_return_val_if_fail (callback != NULL, NULL);
-	g_return_val_if_fail (source_tag != NULL, NULL);
-
-	if (!error_report_only) {
-		g_return_val_if_fail (proxy != NULL, NULL);
-		g_return_val_if_fail (out_cancellable != NULL, NULL);
-		g_return_val_if_fail (finish_void || finish_boolean || finish_string || finish_strv || finish_uint, NULL);
-
-		if (finish_void) {
-			g_return_val_if_fail (finish_boolean == NULL, NULL);
-			g_return_val_if_fail (finish_string == NULL, NULL);
-			g_return_val_if_fail (finish_strv == NULL, NULL);
-			g_return_val_if_fail (finish_uint == NULL, NULL);
-		}
-
-		if (finish_boolean) {
-			g_return_val_if_fail (finish_void == NULL, NULL);
-			g_return_val_if_fail (finish_string == NULL, NULL);
-			g_return_val_if_fail (finish_strv == NULL, NULL);
-			g_return_val_if_fail (finish_uint == NULL, NULL);
-		}
-
-		if (finish_string) {
-			g_return_val_if_fail (finish_void == NULL, NULL);
-			g_return_val_if_fail (finish_boolean == NULL, NULL);
-			g_return_val_if_fail (finish_strv == NULL, NULL);
-			g_return_val_if_fail (finish_uint == NULL, NULL);
-		}
-
-		if (finish_strv) {
-			g_return_val_if_fail (finish_void == NULL, NULL);
-			g_return_val_if_fail (finish_boolean == NULL, NULL);
-			g_return_val_if_fail (finish_string == NULL, NULL);
-			g_return_val_if_fail (finish_uint == NULL, NULL);
-		}
-
-		if (finish_uint) {
-			g_return_val_if_fail (finish_void == NULL, NULL);
-			g_return_val_if_fail (finish_boolean == NULL, NULL);
-			g_return_val_if_fail (finish_string == NULL, NULL);
-			g_return_val_if_fail (finish_strv == NULL, NULL);
-		}
-
-		*proxy = e_client_get_dbus_proxy (client);
-		if (!*proxy)
-			return NULL;
-	}
-
-	use_cancellable = cancellable;
-	if (!use_cancellable)
-		use_cancellable = g_cancellable_new ();
-
-	opid = e_client_register_op (client, use_cancellable);
-	async_data = g_new0 (EClientAsyncOpData, 1);
-	async_data->client = g_object_ref (client);
-	async_data->opid = opid;
-	async_data->source_tag = source_tag;
-	async_data->callback = callback;
-	async_data->user_data = user_data;
-	async_data->finish_void = finish_void;
-	async_data->finish_boolean = finish_boolean;
-	async_data->finish_string = finish_string;
-	async_data->finish_strv = finish_strv;
-	async_data->finish_uint = finish_uint;
-
-	/* EClient from e_client_register_op() took ownership of the use_cancellable */
-	if (use_cancellable != cancellable)
-		g_object_unref (use_cancellable);
-
-	if (out_cancellable)
-		*out_cancellable = use_cancellable;
-
-	return async_data;
-}
-
-void
-e_client_proxy_return_async_error (EClient *client,
-                                   const GError *error,
-                                   GAsyncReadyCallback callback,
-                                   gpointer user_data,
-                                   gpointer source_tag)
-{
-	EClientAsyncOpData *async_data;
-
-	g_return_if_fail (E_IS_CLIENT (client));
-	g_return_if_fail (error != NULL);
-	g_return_if_fail (callback != NULL);
-
-	async_data = prepare_async_data (client, NULL, callback, user_data, source_tag, TRUE, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-	g_return_if_fail (async_data != NULL);
-
-	finish_async_op (async_data, error, TRUE);
-}
-
-void
-e_client_proxy_call_void (EClient *client,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data,
-                          gpointer source_tag,
-                          void (*func) (GDBusProxy *proxy,
-                                        GCancellable *cancellable,
-                                        GAsyncReadyCallback callback,
-                                        gpointer user_data),
-                          EClientProxyFinishVoidFunc finish_void,
-                          EClientProxyFinishBooleanFunc finish_boolean,
-                          EClientProxyFinishStringFunc finish_string,
-                          EClientProxyFinishStrvFunc finish_strv,
-                          EClientProxyFinishUintFunc finish_uint)
-{
-	EClientAsyncOpData *async_data;
-	GDBusProxy *proxy = NULL;
-
-	g_return_if_fail (E_IS_CLIENT (client));
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (source_tag != NULL);
-	e_client_return_async_if_fail (func != NULL, client, callback, user_data, source_tag);
-
-	async_data = prepare_async_data (client, cancellable, callback, user_data, source_tag, FALSE, finish_void, finish_boolean, finish_string, finish_strv, finish_uint, &proxy, &cancellable);
-	e_client_return_async_if_fail (async_data != NULL, client, callback, user_data, source_tag);
-
-	func (proxy, cancellable, async_result_ready_cb, async_data);
-}
-
-void
-e_client_proxy_call_boolean (EClient *client,
-                             gboolean in_boolean,
-                             GCancellable *cancellable,
-                             GAsyncReadyCallback callback,
-                             gpointer user_data,
-                             gpointer source_tag,
-                             void (*func) (GDBusProxy *proxy,
-                                           gboolean in_boolean,
-                                           GCancellable *cancellable,
-                                           GAsyncReadyCallback callback,
-                                           gpointer user_data),
-                             EClientProxyFinishVoidFunc finish_void,
-                             EClientProxyFinishBooleanFunc finish_boolean,
-                             EClientProxyFinishStringFunc finish_string,
-                             EClientProxyFinishStrvFunc finish_strv,
-                             EClientProxyFinishUintFunc finish_uint)
-{
-	EClientAsyncOpData *async_data;
-	GDBusProxy *proxy = NULL;
-
-	g_return_if_fail (E_IS_CLIENT (client));
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (source_tag != NULL);
-	e_client_return_async_if_fail (func != NULL, client, callback, user_data, source_tag);
-
-	async_data = prepare_async_data (client, cancellable, callback, user_data, source_tag, FALSE, finish_void, finish_boolean, finish_string, finish_strv, finish_uint, &proxy, &cancellable);
-	e_client_return_async_if_fail (async_data != NULL, client, callback, user_data, source_tag);
-
-	func (proxy, in_boolean, cancellable, async_result_ready_cb, async_data);
-}
-
-void
-e_client_proxy_call_string (EClient *client,
-                            const gchar *in_string,
-                            GCancellable *cancellable,
-                            GAsyncReadyCallback callback,
-                            gpointer user_data,
-                            gpointer source_tag,
-                            void (*func) (GDBusProxy *proxy,
-                                          const gchar *in_string,
-                                          GCancellable *cancellable,
-                                          GAsyncReadyCallback callback,
-                                          gpointer user_data),
-                            EClientProxyFinishVoidFunc finish_void,
-                            EClientProxyFinishBooleanFunc finish_boolean,
-                            EClientProxyFinishStringFunc finish_string,
-                            EClientProxyFinishStrvFunc finish_strv,
-                            EClientProxyFinishUintFunc finish_uint)
-{
-	EClientAsyncOpData *async_data;
-	GDBusProxy *proxy = NULL;
-
-	g_return_if_fail (E_IS_CLIENT (client));
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (source_tag != NULL);
-	e_client_return_async_if_fail (func != NULL, client, callback, user_data, source_tag);
-	e_client_return_async_if_fail (in_string != NULL, client, callback, user_data, source_tag);
-
-	async_data = prepare_async_data (client, cancellable, callback, user_data, source_tag, FALSE, finish_void, finish_boolean, finish_string, finish_strv, finish_uint, &proxy, &cancellable);
-	e_client_return_async_if_fail (async_data != NULL, client, callback, user_data, source_tag);
-
-	func (proxy, in_string, cancellable, async_result_ready_cb, async_data);
-}
-
-void
-e_client_proxy_call_string_with_res_op_data (EClient *client,
-                                             const gchar *in_string,
-                                             GCancellable *cancellable,
-                                             GAsyncReadyCallback callback,
-                                             gpointer user_data,
-                                             gpointer source_tag,
-                                             const gchar *res_op_data,
-                                             void (*func) (GDBusProxy *proxy,
-                                                           const gchar *in_string,
-                                                           GCancellable *cancellable,
-                                                           GAsyncReadyCallback callback,
-                                                           gpointer user_data),
-                                             EClientProxyFinishVoidFunc finish_void,
-                                             EClientProxyFinishBooleanFunc finish_boolean,
-                                             EClientProxyFinishStringFunc finish_string,
-                                             EClientProxyFinishStrvFunc finish_strv,
-                                             EClientProxyFinishUintFunc finish_uint)
-{
-	EClientAsyncOpData *async_data;
-	GDBusProxy *proxy = NULL;
-
-	g_return_if_fail (E_IS_CLIENT (client));
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (source_tag != NULL);
-	e_client_return_async_if_fail (func != NULL, client, callback, user_data, source_tag);
-	e_client_return_async_if_fail (in_string != NULL, client, callback, user_data, source_tag);
-
-	async_data = prepare_async_data (client, cancellable, callback, user_data, source_tag, FALSE, finish_void, finish_boolean, finish_string, finish_strv, finish_uint, &proxy, &cancellable);
-	e_client_return_async_if_fail (async_data != NULL, client, callback, user_data, source_tag);
-
-	async_data->res_op_data = g_strdup (res_op_data);
-
-	func (proxy, in_string, cancellable, async_result_ready_cb, async_data);
-}
-
-void
-e_client_proxy_call_strv (EClient *client,
-                          const gchar * const *in_strv,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data,
-                          gpointer source_tag,
-                          void (*func) (GDBusProxy *proxy,
-                                        const gchar * const * in_strv,
-                                        GCancellable *cancellable,
-                                        GAsyncReadyCallback callback,
-                                        gpointer user_data),
-                          EClientProxyFinishVoidFunc finish_void,
-                          EClientProxyFinishBooleanFunc finish_boolean,
-                          EClientProxyFinishStringFunc finish_string,
-                          EClientProxyFinishStrvFunc finish_strv,
-                          EClientProxyFinishUintFunc finish_uint)
-{
-	EClientAsyncOpData *async_data;
-	GDBusProxy *proxy = NULL;
-
-	g_return_if_fail (E_IS_CLIENT (client));
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (source_tag != NULL);
-	e_client_return_async_if_fail (func != NULL, client, callback, user_data, source_tag);
-	e_client_return_async_if_fail (in_strv != NULL, client, callback, user_data, source_tag);
-
-	async_data = prepare_async_data (client, cancellable, callback, user_data, source_tag, FALSE, finish_void, finish_boolean, finish_string, finish_strv, finish_uint, &proxy, &cancellable);
-	e_client_return_async_if_fail (async_data != NULL, client, callback, user_data, source_tag);
-
-	func (proxy, in_strv, cancellable, async_result_ready_cb, async_data);
-}
-
-void
-e_client_proxy_call_uint (EClient *client,
-                          guint in_uint,
-                          GCancellable *cancellable,
-                          GAsyncReadyCallback callback,
-                          gpointer user_data,
-                          gpointer source_tag,
-                          void (*func) (GDBusProxy *proxy,
-                                        guint in_uint,
-                                        GCancellable *cancellable,
-                                        GAsyncReadyCallback callback,
-                                        gpointer user_data),
-                          EClientProxyFinishVoidFunc finish_void,
-                          EClientProxyFinishBooleanFunc finish_boolean,
-                          EClientProxyFinishStringFunc finish_string,
-                          EClientProxyFinishStrvFunc finish_strv,
-                          EClientProxyFinishUintFunc finish_uint)
-{
-	EClientAsyncOpData *async_data;
-	GDBusProxy *proxy = NULL;
-
-	g_return_if_fail (E_IS_CLIENT (client));
-	g_return_if_fail (callback != NULL);
-	g_return_if_fail (source_tag != NULL);
-	e_client_return_async_if_fail (func != NULL, client, callback, user_data, source_tag);
-
-	async_data = prepare_async_data (client, cancellable, callback, user_data, source_tag, FALSE, finish_void, finish_boolean, finish_string, finish_strv, finish_uint, &proxy, &cancellable);
-	e_client_return_async_if_fail (async_data != NULL, client, callback, user_data, source_tag);
-
-	func (proxy, in_uint, cancellable, async_result_ready_cb, async_data);
-}
-
-gboolean
-e_client_proxy_call_finish_void (EClient *client,
-                                 GAsyncResult *result,
-                                 GError **error,
-                                 gpointer source_tag)
-{
-	GSimpleAsyncResult *simple;
-	GError *local_error = NULL;
-	EClientAsyncOpData *async_data;
-
-	g_return_val_if_fail (E_IS_CLIENT (client), FALSE);
-	g_return_val_if_fail (result != NULL, FALSE);
-	g_return_val_if_fail (source_tag != NULL, FALSE);
-	g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (client), source_tag), FALSE);
-
-	simple = G_SIMPLE_ASYNC_RESULT (result);
-
-	if (g_simple_async_result_propagate_error (simple, &local_error)) {
-		e_client_unwrap_dbus_error (client, local_error, error);
-		return FALSE;
-	}
-
-	async_data = g_simple_async_result_get_op_res_gpointer (simple);
-	g_return_val_if_fail (async_data != NULL, FALSE);
-
-	return async_data->result;
-}
-
-gboolean
-e_client_proxy_call_finish_boolean (EClient *client,
-                                    GAsyncResult *result,
-                                    gboolean *out_boolean,
-                                    GError **error,
-                                    gpointer source_tag)
-{
-	GSimpleAsyncResult *simple;
-	GError *local_error = NULL;
-	EClientAsyncOpData *async_data;
-
-	g_return_val_if_fail (E_IS_CLIENT (client), FALSE);
-	g_return_val_if_fail (result != NULL, FALSE);
-	g_return_val_if_fail (source_tag != NULL, FALSE);
-	g_return_val_if_fail (out_boolean != NULL, FALSE);
-	g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (client), source_tag), FALSE);
-
-	simple = G_SIMPLE_ASYNC_RESULT (result);
-
-	if (g_simple_async_result_propagate_error (simple, &local_error)) {
-		e_client_unwrap_dbus_error (client, local_error, error);
-		return FALSE;
-	}
-
-	async_data = g_simple_async_result_get_op_res_gpointer (simple);
-	g_return_val_if_fail (async_data != NULL, FALSE);
-
-	*out_boolean = async_data->out.val_boolean;
-
-	return async_data->result;
-}
-
-gboolean
-e_client_proxy_call_finish_string (EClient *client,
-                                   GAsyncResult *result,
-                                   gchar **out_string,
-                                   GError **error,
-                                   gpointer source_tag)
-{
-	GSimpleAsyncResult *simple;
-	GError *local_error = NULL;
-	EClientAsyncOpData *async_data;
-
-	g_return_val_if_fail (E_IS_CLIENT (client), FALSE);
-	g_return_val_if_fail (result != NULL, FALSE);
-	g_return_val_if_fail (source_tag != NULL, FALSE);
-	g_return_val_if_fail (out_string != NULL, FALSE);
-	g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (client), source_tag), FALSE);
-
-	simple = G_SIMPLE_ASYNC_RESULT (result);
-
-	if (g_simple_async_result_propagate_error (simple, &local_error)) {
-		e_client_unwrap_dbus_error (client, local_error, error);
-		return FALSE;
-	}
-
-	async_data = g_simple_async_result_get_op_res_gpointer (simple);
-	g_return_val_if_fail (async_data != NULL, FALSE);
-
-	*out_string = async_data->out.val_string;
-	async_data->out.val_string = NULL;
-
-	return async_data->result;
-}
-
-gboolean
-e_client_proxy_call_finish_strv (EClient *client,
-                                 GAsyncResult *result,
-                                 gchar ***out_strv,
-                                 GError **error,
-                                 gpointer source_tag)
-{
-	GSimpleAsyncResult *simple;
-	GError *local_error = NULL;
-	EClientAsyncOpData *async_data;
-
-	g_return_val_if_fail (E_IS_CLIENT (client), FALSE);
-	g_return_val_if_fail (result != NULL, FALSE);
-	g_return_val_if_fail (source_tag != NULL, FALSE);
-	g_return_val_if_fail (out_strv != NULL, FALSE);
-	g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (client), source_tag), FALSE);
-
-	simple = G_SIMPLE_ASYNC_RESULT (result);
-
-	if (g_simple_async_result_propagate_error (simple, &local_error)) {
-		e_client_unwrap_dbus_error (client, local_error, error);
-		return FALSE;
-	}
-
-	async_data = g_simple_async_result_get_op_res_gpointer (simple);
-	g_return_val_if_fail (async_data != NULL, FALSE);
-
-	*out_strv = async_data->out.val_strv;
-	async_data->out.val_strv = NULL;
-
-	return async_data->result;
-}
-
-gboolean
-e_client_proxy_call_finish_uint (EClient *client,
-                                 GAsyncResult *result,
-                                 guint *out_uint,
-                                 GError **error,
-                                 gpointer source_tag)
-{
-	GSimpleAsyncResult *simple;
-	GError *local_error = NULL;
-	EClientAsyncOpData *async_data;
-
-	g_return_val_if_fail (E_IS_CLIENT (client), FALSE);
-	g_return_val_if_fail (result != NULL, FALSE);
-	g_return_val_if_fail (source_tag != NULL, FALSE);
-	g_return_val_if_fail (out_uint != NULL, FALSE);
-	g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (client), source_tag), FALSE);
-
-	simple = G_SIMPLE_ASYNC_RESULT (result);
-
-	if (g_simple_async_result_propagate_error (simple, &local_error)) {
-		e_client_unwrap_dbus_error (client, local_error, error);
-		return FALSE;
-	}
-
-	async_data = g_simple_async_result_get_op_res_gpointer (simple);
-	g_return_val_if_fail (async_data != NULL, FALSE);
-
-	*out_uint = async_data->out.val_uint;
-
-	return async_data->result;
-}
-
-#define SYNC_CALL_TEMPLATE(_out_test,_the_call)			\
-	GDBusProxy *proxy;					\
-	GCancellable *use_cancellable;				\
-	guint32 opid;						\
-	gboolean result;					\
-	GError *local_error = NULL;				\
-								\
-	g_return_val_if_fail (E_IS_CLIENT (client), FALSE);	\
-	g_return_val_if_fail (func != NULL, FALSE);		\
-	g_return_val_if_fail (_out_test != NULL, FALSE);	\
-								\
-	proxy = e_client_get_dbus_proxy (client);		\
-	g_return_val_if_fail (proxy != NULL, FALSE);		\
-								\
-	use_cancellable = cancellable;				\
-	if (!use_cancellable)					\
-		use_cancellable = g_cancellable_new ();		\
-								\
-	g_object_ref (client);					\
-	opid = e_client_register_op (client, use_cancellable);	\
-								\
-	result = func _the_call;				\
-								\
-	e_client_unregister_op (client, opid);			\
-	g_object_unref (client);				\
-								\
-	if (use_cancellable != cancellable)			\
-		g_object_unref (use_cancellable);		\
-								\
-	e_client_unwrap_dbus_error (client, local_error, error);\
-								\
-	return result;
-
-gboolean
-e_client_proxy_call_sync_void__void (EClient *client,
-                                     GCancellable *cancellable,
-                                     GError **error,
-                                     gboolean (*func) (GDBusProxy *proxy,
-                                                       GCancellable *cancellable,
-                                                       GError **error))
-{
-	SYNC_CALL_TEMPLATE (client, (proxy, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_void__boolean (EClient *client,
-                                        gboolean *out_boolean,
-                                        GCancellable *cancellable,
-                                        GError **error,
-                                        gboolean (*func) (GDBusProxy *proxy,
-                                                          gboolean *out_boolean,
-                                                          GCancellable *cancellable,
-                                                          GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_boolean, (proxy, out_boolean, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_void__string (EClient *client,
-                                       gchar **out_string,
-                                       GCancellable *cancellable,
-                                       GError **error,
-                                       gboolean (*func) (GDBusProxy *proxy,
-                                                         gchar **out_string,
-                                                         GCancellable *cancellable,
-                                                         GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_string, (proxy, out_string, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_void__strv (EClient *client,
-                                     gchar ***out_strv,
-                                     GCancellable *cancellable,
-                                     GError **error,
-                                     gboolean (*func) (GDBusProxy *proxy,
-                                                       gchar ***out_strv,
-                                                       GCancellable *cancellable,
-                                                       GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_strv, (proxy, out_strv, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_void__uint (EClient *client,
-                                     guint *out_uint,
-                                     GCancellable *cancellable,
-                                     GError **error,
-                                     gboolean (*func) (GDBusProxy *proxy,
-                                                       guint *out_uint,
-                                                       GCancellable *cancellable,
-                                                       GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_uint, (proxy, out_uint, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_boolean__void (EClient *client,
-                                        gboolean in_boolean,
-                                        GCancellable *cancellable,
-                                        GError **error,
-                                        gboolean (*func) (GDBusProxy *proxy,
-                                                          gboolean in_boolean,
-                                                          GCancellable *cancellable,
-                                                          GError **error))
-{
-	SYNC_CALL_TEMPLATE (client, (proxy, in_boolean, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_boolean__boolean (EClient *client,
-                                           gboolean in_boolean,
-                                           gboolean *out_boolean,
-                                           GCancellable *cancellable,
-                                           GError **error,
-                                           gboolean (*func) (GDBusProxy *proxy,
-                                                             gboolean in_boolean,
-                                                             gboolean *out_boolean,
-                                                             GCancellable *cancellable,
-                                                             GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_boolean, (proxy, in_boolean, out_boolean, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_boolean__string (EClient *client,
-                                          gboolean in_boolean,
-                                          gchar **out_string,
-                                          GCancellable *cancellable,
-                                          GError **error,
-                                          gboolean (*func) (GDBusProxy *proxy,
-                                                            gboolean in_boolean,
-                                                            gchar **out_string,
-                                                            GCancellable *cancellable,
-                                                            GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_string, (proxy, in_boolean, out_string, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_boolean__strv (EClient *client,
-                                        gboolean in_boolean,
-                                        gchar ***out_strv,
-                                        GCancellable *cancellable,
-                                        GError **error,
-                                        gboolean (*func) (GDBusProxy *proxy,
-                                                          gboolean in_boolean,
-                                                          gchar ***out_strv,
-                                                          GCancellable *cancellable,
-                                                          GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_strv, (proxy, in_boolean, out_strv, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_boolean__uint (EClient *client,
-                                        gboolean in_boolean,
-                                        guint *out_uint,
-                                        GCancellable *cancellable,
-                                        GError **error,
-                                        gboolean (*func) (GDBusProxy *proxy,
-                                                          gboolean in_boolean,
-                                                          guint *out_uint,
-                                                          GCancellable *cancellable,
-                                                          GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_uint, (proxy, in_boolean, out_uint, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_string__void (EClient *client,
-                                       const gchar *in_string,
-                                       GCancellable *cancellable,
-                                       GError **error,
-                                       gboolean (*func) (GDBusProxy *proxy,
-                                                         const gchar *in_string,
-                                                         GCancellable *cancellable,
-                                                         GError **error))
-{
-	SYNC_CALL_TEMPLATE (client, (proxy, in_string, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_string__boolean (EClient *client,
-                                          const gchar *in_string,
-                                          gboolean *out_boolean,
-                                          GCancellable *cancellable,
-                                          GError **error,
-                                          gboolean (*func) (GDBusProxy *proxy,
-                                                            const gchar *in_string,
-                                                            gboolean *out_boolean,
-                                                            GCancellable *cancellable,
-                                                            GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_boolean, (proxy, in_string, out_boolean, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_string__string (EClient *client,
-                                         const gchar *in_string,
-                                         gchar **out_string,
-                                         GCancellable *cancellable,
-                                         GError **error,
-                                         gboolean (*func) (GDBusProxy *proxy,
-                                                           const gchar *in_string,
-                                                           gchar **out_string,
-                                                           GCancellable *cancellable,
-                                                           GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_string, (proxy, in_string, out_string, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_string__strv (EClient *client,
-                                       const gchar *in_string,
-                                       gchar ***out_strv,
-                                       GCancellable *cancellable,
-                                       GError **error,
-                                       gboolean (*func) (GDBusProxy *proxy,
-                                                         const gchar *in_string,
-                                                         gchar ***out_strv,
-                                                         GCancellable *cancellable,
-                                                         GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_strv, (proxy, in_string, out_strv, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_string__uint (EClient *client,
-                                       const gchar *in_string,
-                                       guint *out_uint,
-                                       GCancellable *cancellable,
-                                       GError **error,
-                                       gboolean (*func) (GDBusProxy *proxy,
-                                                         const gchar *in_string,
-                                                         guint *out_uint,
-                                                         GCancellable *cancellable,
-                                                         GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_uint, (proxy, in_string, out_uint, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_strv__void (EClient *client,
-                                     const gchar * const *in_strv,
-                                     GCancellable *cancellable,
-                                     GError **error,
-                                     gboolean (*func) (GDBusProxy *proxy,
-                                                       const gchar * const *in_strv,
-                                                       GCancellable *cancellable,
-                                                       GError **error))
-{
-	SYNC_CALL_TEMPLATE (client, (proxy, in_strv, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_strv__boolean (EClient *client,
-                                        const gchar * const *in_strv,
-                                        gboolean *out_boolean,
-                                        GCancellable *cancellable,
-                                        GError **error,
-                                        gboolean (*func) (GDBusProxy *proxy,
-                                                          const gchar * const *in_strv,
-                                                          gboolean *out_boolean,
-                                                          GCancellable *cancellable,
-                                                          GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_boolean, (proxy, in_strv, out_boolean, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_strv__string (EClient *client,
-                                       const gchar * const *in_strv,
-                                       gchar **out_string,
-                                       GCancellable *cancellable,
-                                       GError **error,
-                                       gboolean (*func) (GDBusProxy *proxy,
-                                                         const gchar * const *in_strv,
-                                                         gchar **out_string,
-                                                         GCancellable *cancellable,
-                                                         GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_string, (proxy, in_strv, out_string, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_strv__strv (EClient *client,
-                                     const gchar * const *in_strv,
-                                     gchar ***out_strv,
-                                     GCancellable *cancellable,
-                                     GError **error,
-                                     gboolean (*func) (GDBusProxy *proxy,
-                                                       const gchar * const *in_strv,
-                                                       gchar ***out_strv,
-                                                       GCancellable *cancellable,
-                                                       GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_strv, (proxy, in_strv, out_strv, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_strv__uint (EClient *client,
-                                     const gchar * const *in_strv,
-                                     guint *out_uint,
-                                     GCancellable *cancellable,
-                                     GError **error,
-                                     gboolean (*func) (GDBusProxy *proxy,
-                                                       const gchar * const *in_strv,
-                                                       guint *out_uint,
-                                                       GCancellable *cancellable,
-                                                       GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_uint, (proxy, in_strv, out_uint, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_uint__void (EClient *client,
-                                     guint in_uint,
-                                     GCancellable *cancellable,
-                                     GError **error,
-                                     gboolean (*func) (GDBusProxy *proxy,
-                                                       guint in_uint,
-                                                       GCancellable *cancellable,
-                                                       GError **error))
-{
-	SYNC_CALL_TEMPLATE (client, (proxy, in_uint, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_uint__boolean (EClient *client,
-                                        guint in_uint,
-                                        gboolean *out_boolean,
-                                        GCancellable *cancellable,
-                                        GError **error,
-                                        gboolean (*func) (GDBusProxy *proxy,
-                                                          guint in_uint,
-                                                          gboolean *out_boolean,
-                                                          GCancellable *cancellable,
-                                                          GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_boolean, (proxy, in_uint, out_boolean, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_uint__string (EClient *client,
-                                       guint in_uint,
-                                       gchar **out_string,
-                                       GCancellable *cancellable,
-                                       GError **error,
-                                       gboolean (*func) (GDBusProxy *proxy,
-                                                         guint in_uint,
-                                                         gchar **out_string,
-                                                         GCancellable *cancellable,
-                                                         GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_string, (proxy, in_uint, out_string, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_uint__strv (EClient *client,
-                                     guint in_uint,
-                                     gchar ***out_strv,
-                                     GCancellable *cancellable,
-                                     GError **error,
-                                     gboolean (*func) (GDBusProxy *proxy,
-                                                       guint in_uint,
-                                                       gchar ***out_strv,
-                                                       GCancellable *cancellable,
-                                                       GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_strv, (proxy, in_uint, out_strv, use_cancellable, &local_error))
-}
-
-gboolean
-e_client_proxy_call_sync_uint__uint (EClient *client,
-                                     guint in_uint,
-                                     guint *out_uint,
-                                     GCancellable *cancellable,
-                                     GError **error,
-                                     gboolean (*func) (GDBusProxy *proxy,
-                                                       guint in_uint,
-                                                       guint *out_uint,
-                                                       GCancellable *cancellable,
-                                                       GError **error))
-{
-	SYNC_CALL_TEMPLATE (out_uint, (proxy, in_uint, out_uint, use_cancellable, &local_error))
-}
-
-#undef SYNC_CALL_TEMPLATE



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]