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

[Matthew Barnes <mbarnes src gnome org>]

commit 76f9b84cf7b6c075586062f2b8625f1ab69b09ae
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Oct 6 12:54:09 2012 -0400

    e-book-backend-sync.h readability cleanups.

 addressbook/libedata-book/e-book-backend-sync.h |  191 +++++++++++++++++++----
 1 files changed, 157 insertions(+), 34 deletions(-)
---
diff --git a/addressbook/libedata-book/e-book-backend-sync.h b/addressbook/libedata-book/e-book-backend-sync.h
index 3f2d623..3fe1112 100644
--- a/addressbook/libedata-book/e-book-backend-sync.h
+++ b/addressbook/libedata-book/e-book-backend-sync.h
@@ -6,19 +6,31 @@
 #error "Only <libedata-book/libedata-book.h> should be included directly."
 #endif
 
-#ifndef __E_BOOK_BACKEND_SYNC_H__
-#define __E_BOOK_BACKEND_SYNC_H__
+#ifndef E_BOOK_BACKEND_SYNC_H
+#define E_BOOK_BACKEND_SYNC_H
 
 #include <libedata-book/e-book-backend.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_BOOK_BACKEND_SYNC \
+	(e_book_backend_sync_get_type ())
+#define E_BOOK_BACKEND_SYNC(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_BOOK_BACKEND_SYNC, EBookBackendSync))
+#define E_BOOK_BACKEND_SYNC_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_BOOK_BACKEND_SYNC, EBookBackendSyncClass))
+#define E_IS_BOOK_BACKEND_SYNC(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_BOOK_BACKEND_SYNC))
+#define E_IS_BOOK_BACKEND_SYNC_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_BOOK_BACKEND_SYNC))
+#define E_BOOK_BACKEND_SYNC_GET_CLASS(cls) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((cls), E_TYPE_BOOK_BACKEND_SYNC, EBookBackendSyncClass))
 
-#define E_TYPE_BOOK_BACKEND_SYNC         (e_book_backend_sync_get_type ())
-#define E_BOOK_BACKEND_SYNC(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_BOOK_BACKEND_SYNC, EBookBackendSync))
-#define E_BOOK_BACKEND_SYNC_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_BOOK_BACKEND_SYNC, EBookBackendSyncClass))
-#define E_IS_BOOK_BACKEND_SYNC(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_BOOK_BACKEND_SYNC))
-#define E_IS_BOOK_BACKEND_SYNC_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_BOOK_BACKEND_SYNC))
-#define E_BOOK_BACKEND_SYNC_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS ((k), E_TYPE_BOOK_BACKEND_SYNC, EBookBackendSyncClass))
+G_BEGIN_DECLS
 
 typedef struct _EBookBackendSync EBookBackendSync;
 typedef struct _EBookBackendSyncClass EBookBackendSyncClass;
@@ -33,35 +45,146 @@ struct _EBookBackendSyncClass {
 	EBookBackendClass parent_class;
 
 	/* Virtual methods */
-	void (*open_sync)			(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, gboolean only_if_exists, GError **error);
-	void (*remove_sync)			(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, GError **error);
-	void (* refresh_sync)			(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, GError **error);
-	gboolean (*get_backend_property_sync)	(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *prop_name, gchar **prop_value, GError **error);
-	gboolean (*set_backend_property_sync)	(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *prop_name, const gchar *prop_value, GError **error);
-	void (*create_contacts_sync)		(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const GSList *vcards, GSList **added_contacts, GError **error);
-	void (*remove_contacts_sync)		(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const GSList *id_list, GSList **removed_ids, GError **error);
-	void (*modify_contacts_sync)		(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const GSList *vcards, GSList **modified_contacts, GError **error);
-	void (*get_contact_sync)		(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *id, gchar **vcard, GError **error);
-	void (*get_contact_list_sync)		(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *query, GSList **contacts, GError **error);
-	void (*get_contact_list_uids_sync)	(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *query, GSList **contacts_uids, GError **error);
+	void		(*open_sync)		(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 gboolean only_if_exists,
+						 GError **error);
+	void		(*remove_sync)		(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 GError **error);
+	void		(*refresh_sync)		(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 GError **error);
+	gboolean	(*get_backend_property_sync)
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const gchar *prop_name,
+						 gchar **prop_value,
+						 GError **error);
+	gboolean	(*set_backend_property_sync)
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const gchar *prop_name,
+						 const gchar *prop_value,
+						 GError **error);
+	void		(*create_contacts_sync)	(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const GSList *vcards,
+						 GSList **added_contacts,
+						 GError **error);
+	void		(*remove_contacts_sync)	(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const GSList *id_list,
+						 GSList **removed_ids,
+						 GError **error);
+	void		(*modify_contacts_sync)	(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const GSList *vcards,
+						 GSList **modified_contacts,
+						 GError **error);
+	void		(*get_contact_sync)	(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const gchar *id,
+						 gchar **vcard,
+						 GError **error);
+	void		(*get_contact_list_sync)
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const gchar *query,
+						 GSList **contacts,
+						 GError **error);
+	void		(*get_contact_list_uids_sync)
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const gchar *query,
+						 GSList **contacts_uids,
+						 GError **error);
 };
 
-GType		e_book_backend_sync_get_type		(void);
+GType		e_book_backend_sync_get_type	(void) G_GNUC_CONST;
 
-gboolean	e_book_backend_sync_construct		(EBookBackendSync *backend);
+gboolean	e_book_backend_sync_construct	(EBookBackendSync *backend);
 
-void		e_book_backend_sync_open		(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, gboolean only_if_exists, GError **error);
-void		e_book_backend_sync_remove		(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, GError **error);
-void		e_book_backend_sync_refresh		(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, GError **error);
-gboolean	e_book_backend_sync_get_backend_property (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *prop_name, gchar **prop_value, GError **error);
-gboolean	e_book_backend_sync_set_backend_property (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *prop_name, const gchar *prop_value, GError **error);
-void		e_book_backend_sync_create_contacts	(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const GSList *vcards, GSList **added_contacts, GError **error);
-void		e_book_backend_sync_remove_contacts	(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const GSList *id_list, GSList **removed_ids, GError **error);
-void		e_book_backend_sync_modify_contacts	(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const GSList *vcards, GSList **modified_contacts, GError **error);
-void		e_book_backend_sync_get_contact		(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *id, gchar **vcard, GError **error);
-void		e_book_backend_sync_get_contact_list	(EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *query, GSList **contacts, GError **error);
-void		e_book_backend_sync_get_contact_list_uids (EBookBackendSync *backend, EDataBook *book, GCancellable *cancellable, const gchar *query, GSList **contacts_uids, GError **error);
+void		e_book_backend_sync_open	(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 gboolean only_if_exists,
+						 GError **error);
+void		e_book_backend_sync_remove	(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 GError **error);
+void		e_book_backend_sync_refresh	(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 GError **error);
+gboolean	e_book_backend_sync_get_backend_property
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const gchar *prop_name,
+						 gchar **prop_value,
+						 GError **error);
+gboolean	e_book_backend_sync_set_backend_property
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const gchar *prop_name,
+						 const gchar *prop_value,
+						 GError **error);
+void		e_book_backend_sync_create_contacts
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const GSList *vcards,
+						 GSList **added_contacts,
+						 GError **error);
+void		e_book_backend_sync_remove_contacts
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const GSList *id_list,
+						 GSList **removed_ids,
+						 GError **error);
+void		e_book_backend_sync_modify_contacts
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const GSList *vcards,
+						 GSList **modified_contacts,
+						 GError **error);
+void		e_book_backend_sync_get_contact	(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const gchar *id,
+						 gchar **vcard,
+						 GError **error);
+void		e_book_backend_sync_get_contact_list
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const gchar *query,
+						 GSList **contacts,
+						 GError **error);
+void		e_book_backend_sync_get_contact_list_uids
+						(EBookBackendSync *backend,
+						 EDataBook *book,
+						 GCancellable *cancellable,
+						 const gchar *query,
+						 GSList **contacts_uids,
+						 GError **error);
 
 G_END_DECLS
 
-#endif /* __E_BOOK_BACKEND_SYNC_H__ */
+#endif /* E_BOOK_BACKEND_SYNC_H */