[evolution-data-server] e-cal-client.h readability cleanups.

[Matthew Barnes <mbarnes src gnome org>]

commit a24b6e43189e88ddcb6304c181dfb475b529b0a7
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Oct 6 15:13:59 2012 -0400

    e-cal-client.h readability cleanups.

 calendar/libecal/e-cal-client.h |  511 ++++++++++++++++++++++++++++++---------
 1 files changed, 391 insertions(+), 120 deletions(-)
---
diff --git a/calendar/libecal/e-cal-client.h b/calendar/libecal/e-cal-client.h
index be175d1..d17198f 100644
--- a/calendar/libecal/e-cal-client.h
+++ b/calendar/libecal/e-cal-client.h
@@ -32,14 +32,24 @@
 #include <libecal/e-cal-recur.h>
 #include <libecal/e-cal-util.h>
 
-G_BEGIN_DECLS
-
-#define E_TYPE_CAL_CLIENT		(e_cal_client_get_type ())
-#define E_CAL_CLIENT(o)			(G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_CAL_CLIENT, ECalClient))
-#define E_CAL_CLIENT_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST ((k), E_TYPE_CAL_CLIENT, ECalClientClass))
-#define E_IS_CAL_CLIENT(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_CAL_CLIENT))
-#define E_IS_CAL_CLIENT_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_CAL_CLIENT))
-#define E_CAL_CLIENT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_CAL_CLIENT, ECalClientClass))
+/* Standard GObject macros */
+#define E_TYPE_CAL_CLIENT \
+	(e_cal_client_get_type ())
+#define E_CAL_CLIENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_CLIENT, ECalClient))
+#define E_CAL_CLIENT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_CLIENT, ECalClientClass))
+#define E_IS_CAL_CLIENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_CLIENT))
+#define E_IS_CAL_CLIENT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_CLIENT))
+#define E_CAL_CLIENT_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_CLIENT, ECalClientClass))
 
 /**
  * CAL_BACKEND_PROPERTY_CAL_EMAIL_ADDRESS:
@@ -96,7 +106,7 @@ GType e_cal_client_source_type_enum_get_type (void);
  **/
 #define E_CAL_CLIENT_ERROR e_cal_client_error_quark ()
 
-GQuark e_cal_client_error_quark (void) G_GNUC_CONST;
+G_BEGIN_DECLS
 
 /**
  * ECalClientError:
@@ -114,11 +124,8 @@ typedef enum {
 	E_CAL_CLIENT_ERROR_INVALID_RANGE
 } ECalClientError;
 
-const gchar *	e_cal_client_error_to_string (ECalClientError code);
-GError *	e_cal_client_error_create (ECalClientError code, const gchar *custom_msg);
-
-typedef struct _ECalClient        ECalClient;
-typedef struct _ECalClientClass   ECalClientClass;
+typedef struct _ECalClient ECalClient;
+typedef struct _ECalClientClass ECalClientClass;
 typedef struct _ECalClientPrivate ECalClientPrivate;
 
 /**
@@ -140,114 +147,378 @@ struct _ECalClientClass {
 	EClientClass parent;
 
 	/* Signals */
-	void (* free_busy_data) (ECalClient *client, const GSList *free_busy_ecalcomps);
+	void		(*free_busy_data)	(ECalClient *client,
+						 const GSList *free_busy_ecalcomps);
 };
 
-GType			e_cal_client_get_type			(void);
-
-/* Creating a new calendar */
-ECalClient *		e_cal_client_new			(ESource *source, ECalClientSourceType source_type, GError **error);
-
-/* Calendar properties not managed by EClient */
-ECalClientSourceType	e_cal_client_get_source_type		(ECalClient *client);
-const gchar *		e_cal_client_get_local_attachment_store	(ECalClient *client);
-void			e_cal_client_set_default_timezone	(ECalClient *client, /* const */ icaltimezone *zone);
-icaltimezone *		e_cal_client_get_default_timezone	(ECalClient *client);
-
-/* Check predefined capabilities */
-gboolean		e_cal_client_check_one_alarm_only	(ECalClient *client);
-gboolean		e_cal_client_check_save_schedules	(ECalClient *client);
-gboolean		e_cal_client_check_organizer_must_attend (ECalClient *client);
-gboolean		e_cal_client_check_organizer_must_accept (ECalClient *client);
-gboolean		e_cal_client_check_recurrences_no_master (ECalClient *client);
-
-/* Utility functions */
-void		e_cal_client_free_icalcomp_slist		(GSList *icalcomps);
-void		e_cal_client_free_ecalcomp_slist		(GSList *ecalcomps);
-
-icaltimezone *	e_cal_client_resolve_tzid_cb			(const gchar *tzid, gpointer data);
-void		e_cal_client_generate_instances			(ECalClient *client, time_t start, time_t end, GCancellable *cancellable, ECalRecurInstanceFn cb, gpointer cb_data, GDestroyNotify destroy_cb_data);
-void		e_cal_client_generate_instances_sync		(ECalClient *client, time_t start, time_t end, ECalRecurInstanceFn cb, gpointer cb_data);
-void		e_cal_client_generate_instances_for_object	(ECalClient *client, icalcomponent *icalcomp, time_t start, time_t end, GCancellable *cancellable, ECalRecurInstanceFn cb, gpointer cb_data, GDestroyNotify destroy_cb_data);
-void		e_cal_client_generate_instances_for_object_sync	(ECalClient *client, icalcomponent *icalcomp, time_t start, time_t end, ECalRecurInstanceFn cb, gpointer cb_data);
-gchar *		e_cal_client_get_component_as_string		(ECalClient *client, icalcomponent *icalcomp);
-
-/* Calendar methods */
-void		e_cal_client_get_default_object			(ECalClient *client, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_get_default_object_finish		(ECalClient *client, GAsyncResult *result, icalcomponent **icalcomp, GError **error);
-gboolean	e_cal_client_get_default_object_sync		(ECalClient *client, icalcomponent **icalcomp, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_get_object				(ECalClient *client, const gchar *uid, const gchar *rid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_get_object_finish			(ECalClient *client, GAsyncResult *result, icalcomponent **icalcomp, GError **error);
-gboolean	e_cal_client_get_object_sync			(ECalClient *client, const gchar *uid, const gchar *rid, icalcomponent **icalcomp, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_get_objects_for_uid		(ECalClient *client, const gchar *uid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_get_objects_for_uid_finish		(ECalClient *client, GAsyncResult *result, GSList **ecalcomps, GError **error);
-gboolean	e_cal_client_get_objects_for_uid_sync		(ECalClient *client, const gchar *uid, GSList **ecalcomps, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_get_object_list			(ECalClient *client, const gchar *sexp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_get_object_list_finish		(ECalClient *client, GAsyncResult *result, GSList **icalcomps, GError **error);
-gboolean	e_cal_client_get_object_list_sync		(ECalClient *client, const gchar *sexp, GSList **icalcomps, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_get_object_list_as_comps		(ECalClient *client, const gchar *sexp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_get_object_list_as_comps_finish	(ECalClient *client, GAsyncResult *result, GSList **ecalcomps, GError **error);
-gboolean	e_cal_client_get_object_list_as_comps_sync	(ECalClient *client, const gchar *sexp, GSList **ecalcomps, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_get_free_busy			(ECalClient *client, time_t start, time_t end, const GSList *users, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_get_free_busy_finish		(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_get_free_busy_sync			(ECalClient *client, time_t start, time_t end, const GSList *users, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_create_object			(ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_create_object_finish		(ECalClient *client, GAsyncResult *result, gchar **uid, GError **error);
-gboolean	e_cal_client_create_object_sync			(ECalClient *client, /* const */ icalcomponent *icalcomp, gchar **uid, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_create_objects			(ECalClient *client, GSList *icalcomps, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_create_objects_finish	(ECalClient *client, GAsyncResult *result, GSList **uids, GError **error);
-gboolean	e_cal_client_create_objects_sync	(ECalClient *client, GSList *icalcomps, GSList **uids, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_modify_object			(ECalClient *client, /* const */ icalcomponent *icalcomp, CalObjModType mod, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_modify_object_finish		(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_modify_object_sync			(ECalClient *client, /* const */ icalcomponent *icalcomp, CalObjModType mod, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_modify_objects			(ECalClient *client, /* const */ GSList *comps, CalObjModType mod, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_modify_objects_finish	(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_modify_objects_sync	(ECalClient *client, /* const */ GSList *comps, CalObjModType mod, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_remove_object			(ECalClient *client, const gchar *uid, const gchar *rid, CalObjModType mod, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_remove_object_finish		(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_remove_object_sync			(ECalClient *client, const gchar *uid, const gchar *rid, CalObjModType mod, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_remove_objects			(ECalClient *client, const GSList *ids, CalObjModType mod, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_remove_objects_finish	(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_remove_objects_sync	(ECalClient *client, const GSList *ids, CalObjModType mod, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_receive_objects			(ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_receive_objects_finish		(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_receive_objects_sync		(ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_send_objects			(ECalClient *client, /* const */ icalcomponent *icalcomp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_send_objects_finish		(ECalClient *client, GAsyncResult *result, GSList **users, icalcomponent **modified_icalcomp, GError **error);
-gboolean	e_cal_client_send_objects_sync			(ECalClient *client, /* const */ icalcomponent *icalcomp, GSList **users, icalcomponent **modified_icalcomp, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_get_attachment_uris		(ECalClient *client, const gchar *uid, const gchar *rid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_get_attachment_uris_finish		(ECalClient *client, GAsyncResult *result, GSList **attachment_uris, GError **error);
-gboolean	e_cal_client_get_attachment_uris_sync		(ECalClient *client, const gchar *uid, const gchar *rid, GSList **attachment_uris, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_discard_alarm			(ECalClient *client, const gchar *uid, const gchar *rid, const gchar *auid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_discard_alarm_finish		(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_discard_alarm_sync			(ECalClient *client, const gchar *uid, const gchar *rid, const gchar *auid, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_get_view				(ECalClient *client, const gchar *sexp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_get_view_finish			(ECalClient *client, GAsyncResult *result, ECalClientView **view, GError **error);
-gboolean	e_cal_client_get_view_sync			(ECalClient *client, const gchar *sexp, ECalClientView **view, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_get_timezone			(ECalClient *client, const gchar *tzid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_get_timezone_finish		(ECalClient *client, GAsyncResult *result, icaltimezone **zone, GError **error);
-gboolean	e_cal_client_get_timezone_sync			(ECalClient *client, const gchar *tzid, icaltimezone **zone, GCancellable *cancellable, GError **error);
-
-void		e_cal_client_add_timezone			(ECalClient *client, /* const */ icaltimezone *zone, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_cal_client_add_timezone_finish		(ECalClient *client, GAsyncResult *result, GError **error);
-gboolean	e_cal_client_add_timezone_sync			(ECalClient *client, /* const */ icaltimezone *zone, GCancellable *cancellable, GError **error);
+GQuark		e_cal_client_error_quark	(void) G_GNUC_CONST;
+const gchar *	e_cal_client_error_to_string	(ECalClientError code);
+GError *	e_cal_client_error_create	(ECalClientError code,
+						 const gchar *custom_msg);
+
+GType		e_cal_client_get_type		(void) G_GNUC_CONST;
+ECalClient *	e_cal_client_new		(ESource *source,
+						 ECalClientSourceType source_type,
+						 GError **error);
+ECalClientSourceType
+		e_cal_client_get_source_type	(ECalClient *client);
+const gchar *	e_cal_client_get_local_attachment_store
+						(ECalClient *client);
+void		e_cal_client_set_default_timezone
+						(ECalClient *client,
+						 icaltimezone *zone);
+icaltimezone *	e_cal_client_get_default_timezone
+						(ECalClient *client);
+gboolean	e_cal_client_check_one_alarm_only
+						(ECalClient *client);
+gboolean	e_cal_client_check_save_schedules
+						(ECalClient *client);
+gboolean	e_cal_client_check_organizer_must_attend
+						(ECalClient *client);
+gboolean	e_cal_client_check_organizer_must_accept
+						(ECalClient *client);
+gboolean	e_cal_client_check_recurrences_no_master
+						(ECalClient *client);
+void		e_cal_client_free_icalcomp_slist
+						(GSList *icalcomps);
+void		e_cal_client_free_ecalcomp_slist
+						(GSList *ecalcomps);
+
+icaltimezone *	e_cal_client_resolve_tzid_cb	(const gchar *tzid,
+						 gpointer data);
+void		e_cal_client_generate_instances	(ECalClient *client,
+						 time_t start,
+						 time_t end,
+						 GCancellable *cancellable,
+						 ECalRecurInstanceFn cb,
+						 gpointer cb_data,
+						 GDestroyNotify destroy_cb_data);
+void		e_cal_client_generate_instances_sync
+						(ECalClient *client,
+						 time_t start,
+						 time_t end,
+						 ECalRecurInstanceFn cb,
+						 gpointer cb_data);
+void		e_cal_client_generate_instances_for_object
+						(ECalClient *client,
+						 icalcomponent *icalcomp,
+						 time_t start,
+						 time_t end,
+						 GCancellable *cancellable,
+						 ECalRecurInstanceFn cb,
+						 gpointer cb_data,
+						 GDestroyNotify destroy_cb_data);
+void		e_cal_client_generate_instances_for_object_sync
+						(ECalClient *client,
+						 icalcomponent *icalcomp,
+						 time_t start,
+						 time_t end,
+						 ECalRecurInstanceFn cb,
+						 gpointer cb_data);
+gchar *		e_cal_client_get_component_as_string
+						(ECalClient *client,
+						 icalcomponent *icalcomp);
+void		e_cal_client_get_default_object	(ECalClient *client,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_get_default_object_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 icalcomponent **icalcomp,
+						 GError **error);
+gboolean	e_cal_client_get_default_object_sync
+						(ECalClient *client,
+						 icalcomponent **icalcomp,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_get_object		(ECalClient *client,
+						 const gchar *uid,
+						 const gchar *rid,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_get_object_finish	(ECalClient *client,
+						 GAsyncResult *result,
+						 icalcomponent **icalcomp,
+						 GError **error);
+gboolean	e_cal_client_get_object_sync	(ECalClient *client,
+						 const gchar *uid,
+						 const gchar *rid,
+						 icalcomponent **icalcomp,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_get_objects_for_uid
+						(ECalClient *client,
+						 const gchar *uid,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_get_objects_for_uid_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GSList **ecalcomps,
+						 GError **error);
+gboolean	e_cal_client_get_objects_for_uid_sync
+						(ECalClient *client,
+						 const gchar *uid,
+						 GSList **ecalcomps,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_get_object_list	(ECalClient *client,
+						 const gchar *sexp,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_get_object_list_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GSList **icalcomps,
+						 GError **error);
+gboolean	e_cal_client_get_object_list_sync
+						(ECalClient *client,
+						 const gchar *sexp,
+						 GSList **icalcomps,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_get_object_list_as_comps
+						(ECalClient *client,
+						 const gchar *sexp,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_get_object_list_as_comps_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GSList **ecalcomps,
+						 GError **error);
+gboolean	e_cal_client_get_object_list_as_comps_sync
+						(ECalClient *client,
+						 const gchar *sexp,
+						 GSList **ecalcomps,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_get_free_busy	(ECalClient *client,
+						 time_t start,
+						 time_t end,
+						 const GSList *users,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_get_free_busy_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_cal_client_get_free_busy_sync	(ECalClient *client,
+						 time_t start,
+						 time_t end,
+						 const GSList *users,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_create_object	(ECalClient *client,
+						 icalcomponent *icalcomp,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_create_object_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 gchar **uid,
+						 GError **error);
+gboolean	e_cal_client_create_object_sync	(ECalClient *client,
+						 icalcomponent *icalcomp,
+						 gchar **uid,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_create_objects	(ECalClient *client,
+						 GSList *icalcomps,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_create_objects_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GSList **uids,
+						 GError **error);
+gboolean	e_cal_client_create_objects_sync
+						(ECalClient *client,
+						 GSList *icalcomps,
+						 GSList **uids,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_modify_object	(ECalClient *client,
+						 icalcomponent *icalcomp,
+						 CalObjModType mod,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_modify_object_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_cal_client_modify_object_sync	(ECalClient *client,
+						 icalcomponent *icalcomp,
+						 CalObjModType mod,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_modify_objects	(ECalClient *client,
+						 GSList *comps,
+						 CalObjModType mod,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_modify_objects_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_cal_client_modify_objects_sync
+						(ECalClient *client,
+						 GSList *comps,
+						 CalObjModType mod,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_remove_object	(ECalClient *client,
+						 const gchar *uid,
+						 const gchar *rid,
+						 CalObjModType mod,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_remove_object_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_cal_client_remove_object_sync	(ECalClient *client,
+						 const gchar *uid,
+						 const gchar *rid,
+						 CalObjModType mod,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_remove_objects	(ECalClient *client,
+						 const GSList *ids,
+						 CalObjModType mod,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_remove_objects_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_cal_client_remove_objects_sync
+						(ECalClient *client,
+						 const GSList *ids,
+						 CalObjModType mod,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_receive_objects	(ECalClient *client,
+						 icalcomponent *icalcomp,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_receive_objects_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_cal_client_receive_objects_sync
+						(ECalClient *client,
+						 icalcomponent *icalcomp,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_send_objects	(ECalClient *client,
+						 icalcomponent *icalcomp,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_send_objects_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GSList **users,
+						 icalcomponent **modified_icalcomp,
+						 GError **error);
+gboolean	e_cal_client_send_objects_sync	(ECalClient *client,
+						 icalcomponent *icalcomp,
+						 GSList **users,
+						 icalcomponent **modified_icalcomp,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_get_attachment_uris
+						(ECalClient *client,
+						 const gchar *uid,
+						 const gchar *rid,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_get_attachment_uris_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GSList **attachment_uris,
+						 GError **error);
+gboolean	e_cal_client_get_attachment_uris_sync
+						(ECalClient *client,
+						 const gchar *uid,
+						 const gchar *rid,
+						 GSList **attachment_uris,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_discard_alarm	(ECalClient *client,
+						 const gchar *uid,
+						 const gchar *rid,
+						 const gchar *auid,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_discard_alarm_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_cal_client_discard_alarm_sync	(ECalClient *client,
+						 const gchar *uid,
+						 const gchar *rid,
+						 const gchar *auid,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_get_view		(ECalClient *client,
+						 const gchar *sexp,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_get_view_finish	(ECalClient *client,
+						 GAsyncResult *result,
+						 ECalClientView **view,
+						 GError **error);
+gboolean	e_cal_client_get_view_sync	(ECalClient *client,
+						 const gchar *sexp,
+						 ECalClientView **view,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_get_timezone	(ECalClient *client,
+						 const gchar *tzid,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_get_timezone_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 icaltimezone **zone,
+						 GError **error);
+gboolean	e_cal_client_get_timezone_sync	(ECalClient *client,
+						 const gchar *tzid,
+						 icaltimezone **zone,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_cal_client_add_timezone	(ECalClient *client,
+						 icaltimezone *zone,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_cal_client_add_timezone_finish
+						(ECalClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_cal_client_add_timezone_sync	(ECalClient *client,
+						 icaltimezone *zone,
+						 GCancellable *cancellable,
+						 GError **error);
 
 G_END_DECLS