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

[Matthew Barnes <mbarnes src gnome org>]

commit cf9df251d99b5bf99b198da063b8d5baa557b470
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Oct 6 13:49:27 2012 -0400

    e-book-client.h readability cleanups.

 addressbook/libebook/e-book-client.h |  266 +++++++++++++++++++++++++---------
 1 files changed, 197 insertions(+), 69 deletions(-)
---
diff --git a/addressbook/libebook/e-book-client.h b/addressbook/libebook/e-book-client.h
index d0c3b79..c340849 100644
--- a/addressbook/libebook/e-book-client.h
+++ b/addressbook/libebook/e-book-client.h
@@ -31,14 +31,24 @@
 #include <libebook/e-book-client-view.h>
 #include <libebook/e-contact.h>
 
-G_BEGIN_DECLS
-
-#define E_TYPE_BOOK_CLIENT		(e_book_client_get_type ())
-#define E_BOOK_CLIENT(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_BOOK_CLIENT, EBookClient))
-#define E_BOOK_CLIENT_CLASS(k)		(G_TYPE_CHECK_CLASS_CAST ((k), E_TYPE_BOOK_CLIENT, EBookClientClass))
-#define E_IS_BOOK_CLIENT(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_BOOK_CLIENT))
-#define E_IS_BOOK_CLIENT_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_BOOK_CLIENT))
-#define E_BOOK_CLIENT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_BOOK_CLIENT, EBookClientClass))
+/* Standard GObject macros */
+#define E_TYPE_BOOK_CLIENT \
+	(e_book_client_get_type ())
+#define E_BOOK_CLIENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_BOOK_CLIENT, EBookClient))
+#define E_BOOK_CLIENT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_BOOK_CLIENT, EBookClientClass))
+#define E_IS_BOOK_CLIENT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_BOOK_CLIENT))
+#define E_IS_BOOK_CLIENT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_BOOK_CLIENT))
+#define E_BOOK_CLIENT_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_BOOK_CLIENT, EBookClientClass))
 
 /**
  * BOOK_BACKEND_PROPERTY_REQUIRED_FIELDS:
@@ -76,7 +86,7 @@ G_BEGIN_DECLS
  **/
 #define E_BOOK_CLIENT_ERROR e_book_client_error_quark ()
 
-GQuark e_book_client_error_quark (void) G_GNUC_CONST;
+G_BEGIN_DECLS
 
 /**
  * EBookClientError:
@@ -93,9 +103,6 @@ typedef enum {
 	E_BOOK_CLIENT_ERROR_NO_SPACE
 } EBookClientError;
 
-const gchar *	e_book_client_error_to_string (EBookClientError code);
-GError *	e_book_client_error_create (EBookClientError code, const gchar *custom_msg);
-
 typedef struct _EBookClient        EBookClient;
 typedef struct _EBookClientClass   EBookClientClass;
 typedef struct _EBookClientPrivate EBookClientPrivate;
@@ -110,69 +117,190 @@ typedef struct _EBookClientPrivate EBookClientPrivate;
  **/
 struct _EBookClient {
 	EClient parent;
-
-	/*< private >*/
 	EBookClientPrivate *priv;
 };
 
 struct _EBookClientClass {
-	EClientClass parent;
+	EClientClass parent_class;
 };
 
-GType		e_book_client_get_type				(void);
-
-/* Creating a new addressbook */
-EBookClient *	e_book_client_new				(ESource *source, GError **error);
-
-/* Identity */
-gboolean	e_book_client_get_self				(ESourceRegistry *registry, EContact **contact, EBookClient **client, GError **error);
-gboolean	e_book_client_set_self				(EBookClient *client, EContact *contact, GError **error);
-gboolean	e_book_client_is_self				(EContact *contact);
-
-/* Addressbook methods */
-void		e_book_client_add_contact			(EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_add_contact_finish		(EBookClient *client, GAsyncResult *result, gchar **added_uid, GError **error);
-gboolean	e_book_client_add_contact_sync			(EBookClient *client, /* const */ EContact *contact, gchar **added_uid, GCancellable *cancellable, GError **error);
-
-void		e_book_client_add_contacts			(EBookClient *client, /* const */ GSList *contacts, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_add_contacts_finish		(EBookClient *client, GAsyncResult *result, GSList **added_uids, GError **error);
-gboolean	e_book_client_add_contacts_sync			(EBookClient *client, /* const */ GSList *contacts, GSList **added_uids, GCancellable *cancellable, GError **error);
-
-void		e_book_client_modify_contact			(EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_modify_contact_finish		(EBookClient *client, GAsyncResult *result, GError **error);
-gboolean	e_book_client_modify_contact_sync		(EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GError **error);
-
-void		e_book_client_modify_contacts			(EBookClient *client, /* const */ GSList *contacts, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_modify_contacts_finish		(EBookClient *client, GAsyncResult *result, GError **error);
-gboolean	e_book_client_modify_contacts_sync		(EBookClient *client, /* const */ GSList *contacts, GCancellable *cancellable, GError **error);
-
-void		e_book_client_remove_contact			(EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_remove_contact_finish		(EBookClient *client, GAsyncResult *result, GError **error);
-gboolean	e_book_client_remove_contact_sync		(EBookClient *client, /* const */ EContact *contact, GCancellable *cancellable, GError **error);
-
-void		e_book_client_remove_contact_by_uid		(EBookClient *client, const gchar *uid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_remove_contact_by_uid_finish	(EBookClient *client, GAsyncResult *result, GError **error);
-gboolean	e_book_client_remove_contact_by_uid_sync	(EBookClient *client, const gchar *uid, GCancellable *cancellable, GError **error);
-
-void		e_book_client_remove_contacts			(EBookClient *client, const GSList *uids, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_remove_contacts_finish		(EBookClient *client, GAsyncResult *result, GError **error);
-gboolean	e_book_client_remove_contacts_sync		(EBookClient *client, const GSList *uids, GCancellable *cancellable, GError **error);
-
-void		e_book_client_get_contact			(EBookClient *client, const gchar *uid, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_get_contact_finish		(EBookClient *client, GAsyncResult *result, EContact **contact, GError **error);
-gboolean	e_book_client_get_contact_sync			(EBookClient *client, const gchar *uid, EContact **contact, GCancellable *cancellable, GError **error);
-
-void		e_book_client_get_contacts			(EBookClient *client, const gchar *sexp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_get_contacts_finish		(EBookClient *client, GAsyncResult *result, GSList **contacts, GError **error);
-gboolean	e_book_client_get_contacts_sync			(EBookClient *client, const gchar *sexp, GSList **contacts, GCancellable *cancellable, GError **error);
-
-void		e_book_client_get_contacts_uids			(EBookClient *client, const gchar *sexp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_get_contacts_uids_finish		(EBookClient *client, GAsyncResult *result, GSList **contacts_uids, GError **error);
-gboolean	e_book_client_get_contacts_uids_sync		(EBookClient *client, const gchar *sexp, GSList **contacts_uids, GCancellable *cancellable, GError **error);
-
-void		e_book_client_get_view				(EBookClient *client, const gchar *sexp, GCancellable *cancellable, GAsyncReadyCallback callback, gpointer user_data);
-gboolean	e_book_client_get_view_finish			(EBookClient *client, GAsyncResult *result, EBookClientView **view, GError **error);
-gboolean	e_book_client_get_view_sync			(EBookClient *client, const gchar *sexp, EBookClientView **view, GCancellable *cancellable, GError **error);
+GQuark		e_book_client_error_quark	(void) G_GNUC_CONST;
+const gchar *	e_book_client_error_to_string	(EBookClientError code);
+GError *	e_book_client_error_create	(EBookClientError code,
+						 const gchar *custom_msg);
+
+GType		e_book_client_get_type		(void) G_GNUC_CONST;
+EBookClient *	e_book_client_new		(ESource *source,
+						 GError **error);
+gboolean	e_book_client_get_self		(ESourceRegistry *registry,
+						 EContact **contact,
+						 EBookClient **client,
+						 GError **error);
+gboolean	e_book_client_set_self		(EBookClient *client,
+						 EContact *contact,
+						 GError **error);
+gboolean	e_book_client_is_self		(EContact *contact);
+void		e_book_client_add_contact	(EBookClient *client,
+						 EContact *contact,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_add_contact_finish
+						(EBookClient *client,
+						 GAsyncResult *result,
+						 gchar **added_uid,
+						 GError **error);
+gboolean	e_book_client_add_contact_sync	(EBookClient *client,
+						 EContact *contact,
+						 gchar **added_uid,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_client_add_contacts	(EBookClient *client,
+						 GSList *contacts,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_add_contacts_finish
+						(EBookClient *client,
+						 GAsyncResult *result,
+						 GSList **added_uids,
+						 GError **error);
+gboolean	e_book_client_add_contacts_sync	(EBookClient *client,
+						 GSList *contacts,
+						 GSList **added_uids,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_client_modify_contact	(EBookClient *client,
+						 EContact *contact,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_modify_contact_finish
+						(EBookClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_book_client_modify_contact_sync
+						(EBookClient *client,
+						 EContact *contact,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_client_modify_contacts	(EBookClient *client,
+						 GSList *contacts,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_modify_contacts_finish
+						(EBookClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_book_client_modify_contacts_sync
+						(EBookClient *client,
+						 GSList *contacts,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_client_remove_contact	(EBookClient *client,
+						 EContact *contact,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_remove_contact_finish
+						(EBookClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_book_client_remove_contact_sync
+						(EBookClient *client,
+						 EContact *contact,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_client_remove_contact_by_uid
+						(EBookClient *client,
+						 const gchar *uid,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_remove_contact_by_uid_finish
+						(EBookClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_book_client_remove_contact_by_uid_sync
+						(EBookClient *client,
+						 const gchar *uid,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_client_remove_contacts	(EBookClient *client,
+						 const GSList *uids,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_remove_contacts_finish
+						(EBookClient *client,
+						 GAsyncResult *result,
+						 GError **error);
+gboolean	e_book_client_remove_contacts_sync
+						(EBookClient *client,
+						 const GSList *uids,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_client_get_contact	(EBookClient *client,
+						 const gchar *uid,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_get_contact_finish
+						(EBookClient *client,
+						 GAsyncResult *result,
+						 EContact **contact,
+						 GError **error);
+gboolean	e_book_client_get_contact_sync	(EBookClient *client,
+						 const gchar *uid,
+						 EContact **contact,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_client_get_contacts	(EBookClient *client,
+						 const gchar *sexp,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_get_contacts_finish
+						(EBookClient *client,
+						 GAsyncResult *result,
+						 GSList **contacts,
+						 GError **error);
+gboolean	e_book_client_get_contacts_sync	(EBookClient *client,
+						 const gchar *sexp,
+						 GSList **contacts,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_client_get_contacts_uids	(EBookClient *client,
+						 const gchar *sexp,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_get_contacts_uids_finish
+						(EBookClient *client,
+						 GAsyncResult *result,
+						 GSList **contacts_uids,
+						 GError **error);
+gboolean	e_book_client_get_contacts_uids_sync
+						(EBookClient *client,
+						 const gchar *sexp,
+						 GSList **contacts_uids,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_client_get_view		(EBookClient *client,
+						 const gchar *sexp,
+						 GCancellable *cancellable,
+						 GAsyncReadyCallback callback,
+						 gpointer user_data);
+gboolean	e_book_client_get_view_finish	(EBookClient *client,
+						 GAsyncResult *result,
+						 EBookClientView **view,
+						 GError **error);
+gboolean	e_book_client_get_view_sync	(EBookClient *client,
+						 const gchar *sexp,
+						 EBookClientView **view,
+						 GCancellable *cancellable,
+						 GError **error);
 
 G_END_DECLS