[evolution-data-server] Header file cleanup.

[Matthew Barnes <mbarnes src gnome org>]

commit 24ca03f8852c48029a6106a06db8cea00b369cc1
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue Jul 20 07:32:08 2010 -0400

    Header file cleanup.

 addressbook/libedata-book/e-book-backend-cache.h |   78 ++++++---
 calendar/libedata-cal/e-cal-backend-cache.h      |  114 +++++++++-----
 calendar/libedata-cal/e-cal-backend-file-store.h |   55 ++++---
 calendar/libedata-cal/e-cal-backend-store.h      |  186 +++++++++++++---------
 4 files changed, 268 insertions(+), 165 deletions(-)
---
diff --git a/addressbook/libedata-book/e-book-backend-cache.h b/addressbook/libedata-book/e-book-backend-cache.h
index 476beea..ac7d045 100644
--- a/addressbook/libedata-book/e-book-backend-cache.h
+++ b/addressbook/libedata-book/e-book-backend-cache.h
@@ -26,41 +26,67 @@
 #include "libebackend/e-file-cache.h"
 #include <libebook/e-contact.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_BOOK_BACKEND_CACHE \
+	(e_book_backend_cache_get_type ())
+#define E_BOOK_BACKEND_CACHE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_BOOK_BACKEND_CACHE, EBookBackendCache))
+#define E_BOOK_BACKEND_CACHE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_BOOK_BACKEND_CACHE, EBookBackendCacheClass))
+#define E_IS_BOOK_BACKEND_CACHE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_BOOK_BACKEND_CACHE))
+#define E_IS_BOOK_BACKEND_CACHE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_BOOK_BACKEND_CACHE))
+#define E_BOOK_BACKEND_CACHE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_BOOK_BACKEND_CACHE, EBookBackendCacheClass))
 
-#define E_TYPE_BOOK_BACKEND_CACHE            (e_book_backend_cache_get_type ())
-#define E_BOOK_BACKEND_CACHE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_BOOK_BACKEND_CACHE, EBookBackendCache))
-#define E_BOOK_BACKEND_CACHE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_BOOK_BACKEND_CACHE, EBookBackendCacheClass))
-#define E_IS_BOOK_BACKEND_CACHE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_BOOK_BACKEND_CACHE))
-#define E_IS_BOOK_BACKEND_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_BOOK_BACKEND_CACHE))
+G_BEGIN_DECLS
 
+typedef struct _EBookBackendCache EBookBackendCache;
+typedef struct _EBookBackendCacheClass EBookBackendCacheClass;
 typedef struct _EBookBackendCachePrivate EBookBackendCachePrivate;
 
-typedef struct {
+struct _EBookBackendCache {
 	EFileCache parent;
 	EBookBackendCachePrivate *priv;
-} EBookBackendCache;
+};
 
-typedef struct {
+struct _EBookBackendCacheClass {
 	EFileCacheClass parent_class;
-} EBookBackendCacheClass;
+};
 
-GType e_book_backend_cache_get_type (void);
-EBookBackendCache* e_book_backend_cache_new (const gchar *uri);
-EContact* e_book_backend_cache_get_contact (EBookBackendCache *cache, const gchar *uid);
-gboolean e_book_backend_cache_add_contact (EBookBackendCache *cache,
-					   EContact *contact);
-gboolean e_book_backend_cache_remove_contact (EBookBackendCache *cache,
-					      const gchar *uid);
-gboolean e_book_backend_cache_check_contact (EBookBackendCache *cache, const gchar *uid);
-GList*   e_book_backend_cache_get_contacts (EBookBackendCache *cache, const gchar *query);
-gboolean e_book_backend_cache_exists (const gchar *uri);
-void     e_book_backend_cache_set_populated (EBookBackendCache *cache);
-gboolean e_book_backend_cache_is_populated (EBookBackendCache *cache);
-void e_book_backend_cache_set_time (EBookBackendCache *cache, const gchar *t);
-gchar *e_book_backend_cache_get_time (EBookBackendCache *cache);
-GPtrArray* e_book_backend_cache_search (EBookBackendCache *cache, const gchar *query);
+GType		e_book_backend_cache_get_type	(void);
+EBookBackendCache *
+		e_book_backend_cache_new	(const gchar *uri);
+EContact *	e_book_backend_cache_get_contact(EBookBackendCache *cache,
+						 const gchar *uid);
+gboolean	e_book_backend_cache_add_contact(EBookBackendCache *cache,
+						 EContact *contact);
+gboolean	e_book_backend_cache_remove_contact
+						(EBookBackendCache *cache,
+						 const gchar *uid);
+gboolean	e_book_backend_cache_check_contact
+						(EBookBackendCache *cache,
+						 const gchar *uid);
+GList *		e_book_backend_cache_get_contacts
+						(EBookBackendCache *cache,
+						 const gchar *query);
+gboolean	e_book_backend_cache_exists	(const gchar *uri);
+void		e_book_backend_cache_set_populated
+						(EBookBackendCache *cache);
+gboolean	e_book_backend_cache_is_populated
+						(EBookBackendCache *cache);
+void		e_book_backend_cache_set_time	(EBookBackendCache *cache,
+						 const gchar *t);
+gchar *		e_book_backend_cache_get_time	(EBookBackendCache *cache);
+GPtrArray *	e_book_backend_cache_search	(EBookBackendCache *cache,
+						 const gchar *query);
 
 G_END_DECLS
 
-#endif
+#endif /* E_BOOK_BACKEND_CACHE_H */
diff --git a/calendar/libedata-cal/e-cal-backend-cache.h b/calendar/libedata-cal/e-cal-backend-cache.h
index 09490d7..5354f3a 100644
--- a/calendar/libedata-cal/e-cal-backend-cache.h
+++ b/calendar/libedata-cal/e-cal-backend-cache.h
@@ -26,15 +26,29 @@
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_CAL_BACKEND_CACHE \
+	(e_cal_backend_cache_get_type ())
+#define E_CAL_BACKEND_CACHE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_BACKEND_CACHE, ECalBackendCache))
+#define E_CAL_BACKEND_CACHE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_BACKEND_CACHE, ECalBackendCacheClass))
+#define E_IS_CAL_BACKEND_CACHE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_BACKEND_CACHE))
+#define E_IS_CAL_BACKEND_CACHE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_BACKEND_CACHE))
+#define E_CAL_BACKEND_CACHE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_BACKEND_CACHE, ECalBackendCacheClass))
 
-#define E_TYPE_CAL_BACKEND_CACHE            (e_cal_backend_cache_get_type ())
-#define E_CAL_BACKEND_CACHE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_BACKEND_CACHE, ECalBackendCache))
-#define E_CAL_BACKEND_CACHE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_BACKEND_CACHE, ECalBackendCacheClass))
-#define E_IS_CAL_BACKEND_CACHE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_BACKEND_CACHE))
-#define E_IS_CAL_BACKEND_CACHE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_BACKEND_CACHE))
+G_BEGIN_DECLS
 
 typedef struct _ECalBackendCache ECalBackendCache;
+typedef struct _ECalBackendCacheClass ECalBackendCacheClass;
 typedef struct _ECalBackendCachePrivate ECalBackendCachePrivate;
 
 struct _ECalBackendCache {
@@ -42,43 +56,61 @@ struct _ECalBackendCache {
 	ECalBackendCachePrivate *priv;
 };
 
-typedef struct {
+struct _ECalBackendCacheClass {
 	EFileCacheClass parent_class;
-} ECalBackendCacheClass;
-
-GType               e_cal_backend_cache_get_type (void);
-
-ECalBackendCache   *e_cal_backend_cache_new (const gchar *uri, ECalSourceType source_type);
-ECalComponent      *e_cal_backend_cache_get_component (ECalBackendCache *cache,
-						       const gchar *uid,
-						       const gchar *rid);
-gboolean            e_cal_backend_cache_put_component (ECalBackendCache *cache, ECalComponent *comp);
-gboolean            e_cal_backend_cache_remove_component (ECalBackendCache *cache,
-							  const gchar *uid,
-							  const gchar *rid);
-GList              *e_cal_backend_cache_get_components (ECalBackendCache *cache);
-GSList             *e_cal_backend_cache_get_components_by_uid (ECalBackendCache *cache, const gchar *uid);
-
-const icaltimezone *e_cal_backend_cache_get_timezone (ECalBackendCache *cache, const gchar *tzid);
-gboolean            e_cal_backend_cache_put_timezone (ECalBackendCache *cache, const icaltimezone *zone);
-gboolean            e_cal_backend_cache_remove_timezone (ECalBackendCache *cache, const gchar *tzid);
-
-gboolean            e_cal_backend_cache_put_default_timezone (ECalBackendCache *cache, icaltimezone *default_zone);
-icaltimezone       *e_cal_backend_cache_get_default_timezone (ECalBackendCache *cache);
-
-GSList             *e_cal_backend_cache_get_keys (ECalBackendCache *cache);
-
-const gchar         *e_cal_backend_cache_get_marker (ECalBackendCache *cache);
-void                e_cal_backend_cache_set_marker (ECalBackendCache *cache);
-
-gboolean e_cal_backend_cache_put_server_utc_time (ECalBackendCache *cache, const gchar *utc_str);
-const gchar * e_cal_backend_cache_get_server_utc_time (ECalBackendCache *cache);
-
-gboolean e_cal_backend_cache_put_key_value (ECalBackendCache *cache, const gchar *key, const gchar *value);
-const gchar * e_cal_backend_cache_get_key_value (ECalBackendCache *cache, const gchar *key);
+};
 
-gboolean	e_cal_backend_cache_remove (const gchar *uri, ECalSourceType source_type);
+GType		e_cal_backend_cache_get_type	(void);
+ECalBackendCache *
+		e_cal_backend_cache_new		(const gchar *uri,
+						 ECalSourceType source_type);
+ECalComponent *	e_cal_backend_cache_get_component
+						(ECalBackendCache *cache,
+						 const gchar *uid,
+						 const gchar *rid);
+gboolean	e_cal_backend_cache_put_component
+						(ECalBackendCache *cache,
+						 ECalComponent *comp);
+gboolean	e_cal_backend_cache_remove_component
+						(ECalBackendCache *cache,
+						 const gchar *uid,
+						 const gchar *rid);
+GList *		e_cal_backend_cache_get_components
+						(ECalBackendCache *cache);
+GSList *	e_cal_backend_cache_get_components_by_uid
+						(ECalBackendCache *cache,
+						 const gchar *uid);
+const icaltimezone *
+		e_cal_backend_cache_get_timezone(ECalBackendCache *cache,
+						 const gchar *tzid);
+gboolean	e_cal_backend_cache_put_timezone(ECalBackendCache *cache,
+						 const icaltimezone *zone);
+gboolean	e_cal_backend_cache_remove_timezone
+						(ECalBackendCache *cache,
+						 const gchar *tzid);
+gboolean	e_cal_backend_cache_put_default_timezone
+						(ECalBackendCache *cache,
+						 icaltimezone *default_zone);
+icaltimezone *	e_cal_backend_cache_get_default_timezone
+						(ECalBackendCache *cache);
+GSList *	e_cal_backend_cache_get_keys	(ECalBackendCache *cache);
+const gchar *	e_cal_backend_cache_get_marker	(ECalBackendCache *cache);
+void		e_cal_backend_cache_set_marker	(ECalBackendCache *cache);
+gboolean	e_cal_backend_cache_put_server_utc_time
+						(ECalBackendCache *cache,
+						 const gchar *utc_str);
+const gchar *	e_cal_backend_cache_get_server_utc_time
+						(ECalBackendCache *cache);
+gboolean	e_cal_backend_cache_put_key_value
+						(ECalBackendCache *cache,
+						 const gchar *key,
+						 const gchar *value);
+const gchar *	e_cal_backend_cache_get_key_value
+						(ECalBackendCache *cache,
+						 const gchar *key);
+gboolean	e_cal_backend_cache_remove	(const gchar *uri,
+						 ECalSourceType source_type);
 
 G_END_DECLS
 
-#endif
+#endif /* E_CAL_BACKEND_CACHE_H */
diff --git a/calendar/libedata-cal/e-cal-backend-file-store.h b/calendar/libedata-cal/e-cal-backend-file-store.h
index 40daff2..5a9016f 100644
--- a/calendar/libedata-cal/e-cal-backend-file-store.h
+++ b/calendar/libedata-cal/e-cal-backend-file-store.h
@@ -19,31 +19,35 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef _E_CAL_BACKEND_FILE_STORE
-#define _E_CAL_BACKEND_FILE_STORE
+#ifndef E_CAL_BACKEND_FILE_STORE_H
+#define E_CAL_BACKEND_FILE_STORE_H
 
 #include <glib-object.h>
 #include "e-cal-backend-store.h"
 
-G_BEGIN_DECLS
-
-#define E_TYPE_CAL_BACKEND_FILE_STORE e_cal_backend_file_store_get_type()
-
+/* Standard GObject macros */
+#define E_TYPE_CAL_BACKEND_FILE_STORE \
+	(e_cal_backend_file_store_get_type ())
 #define E_CAL_BACKEND_FILE_STORE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_BACKEND_FILE_STORE, ECalBackendFileStore))
-
-#define E_CAL_BACKEND_FILE_STORE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_BACKEND_FILE_STORE, ECalBackendFileStoreClass))
-
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_BACKEND_FILE_STORE, ECalBackendFileStore))
+#define E_CAL_BACKEND_FILE_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_BACKEND_FILE_STORE, ECalBackendFileStoreClass))
 #define E_IS_CAL_BACKEND_FILE_STORE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_BACKEND_FILE_STORE))
-
-#define E_IS_CAL_BACKEND_FILE_STORE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_BACKEND_FILE_STORE))
-
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_BACKEND_FILE_STORE))
+#define E_IS_CAL_BACKEND_FILE_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_BACKEND_FILE_STORE))
 #define E_CAL_BACKEND_FILE_STORE_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_CAL_BACKEND_FILE_STORE, ECalBackendFileStoreClass))
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_BACKEND_FILE_STORE, ECalBackendFileStoreClass))
 
+G_BEGIN_DECLS
+
+typedef struct _ECalBackendFileStore ECalBackendFileStore;
+typedef struct _ECalBackendFileStoreClass ECalBackendFileStoreClass;
 typedef struct _ECalBackendFileStorePrivate ECalBackendFileStorePrivate;
 
 /**
@@ -51,19 +55,20 @@ typedef struct _ECalBackendFileStorePrivate ECalBackendFileStorePrivate;
  *
  * Since: 2.28
  **/
-typedef struct {
+struct _ECalBackendFileStore {
 	ECalBackendStore parent;
 	ECalBackendFileStorePrivate *priv;
-} ECalBackendFileStore;
+};
 
-typedef struct {
+struct _ECalBackendFileStoreClass {
 	ECalBackendStoreClass parent_class;
-} ECalBackendFileStoreClass;
-
-GType e_cal_backend_file_store_get_type (void);
+};
 
-ECalBackendFileStore* e_cal_backend_file_store_new (const gchar *uri, ECalSourceType source_type);
+GType		e_cal_backend_file_store_get_type	(void);
+ECalBackendFileStore *
+		e_cal_backend_file_store_new		(const gchar *uri,
+						 	 ECalSourceType source_type);
 
 G_END_DECLS
 
-#endif /* _E_CAL_BACKEND_FILE_STORE */
+#endif /* E_CAL_BACKEND_FILE_STORE_H */
diff --git a/calendar/libedata-cal/e-cal-backend-store.h b/calendar/libedata-cal/e-cal-backend-store.h
index 290d572..2eb6405 100644
--- a/calendar/libedata-cal/e-cal-backend-store.h
+++ b/calendar/libedata-cal/e-cal-backend-store.h
@@ -19,32 +19,35 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef _E_CAL_BACKEND_STORE
-#define _E_CAL_BACKEND_STORE
+#ifndef E_CAL_BACKEND_STORE_H
+#define E_CAL_BACKEND_STORE_H
 
 #include <glib-object.h>
 #include <libecal/e-cal-component.h>
 #include <libecal/e-cal.h>
 
-G_BEGIN_DECLS
-
-#define E_TYPE_CAL_BACKEND_STORE e_cal_backend_store_get_type()
-
+#define E_TYPE_CAL_BACKEND_STORE \
+	(e_cal_backend_store_get_type ())
 #define E_CAL_BACKEND_STORE(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_BACKEND_STORE, ECalBackendStore))
-
-#define E_CAL_BACKEND_STORE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_BACKEND_STORE, ECalBackendStoreClass))
-
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_BACKEND_STORE, ECalBackendStore))
+#define E_CAL_BACKEND_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_BACKEND_STORE, ECalBackendStoreClass))
 #define E_IS_CAL_BACKEND_STORE(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_BACKEND_STORE))
-
-#define E_IS_CAL_BACKEND_STORE_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_BACKEND_STORE))
-
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_BACKEND_STORE))
+#define E_IS_CAL_BACKEND_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_BACKEND_STORE))
 #define E_CAL_BACKEND_STORE_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TYPE_CAL_BACKEND_STORE, ECalBackendStoreClass))
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_BACKEND_STORE, ECalBackendStoreClass))
 
+G_BEGIN_DECLS
+
+typedef struct _ECalBackendStore ECalBackendStore;
+typedef struct _ECalBackendStoreClass ECalBackendStoreClass;
 typedef struct _ECalBackendStorePrivate ECalBackendStorePrivate;
 
 /**
@@ -52,68 +55,105 @@ typedef struct _ECalBackendStorePrivate ECalBackendStorePrivate;
  *
  * Since: 2.28
  **/
-typedef struct {
+struct _ECalBackendStore {
 	GObject parent;
 	ECalBackendStorePrivate *priv;
-} ECalBackendStore;
+};
 
-typedef struct {
+struct _ECalBackendStoreClass {
 	GObjectClass parent_class;
 
 	/* virtual methods */
-	gboolean	(*load) (ECalBackendStore *store);
-	gboolean	(*remove) (ECalBackendStore *store);
-	gboolean	(*clean) (ECalBackendStore *store);
-
-	ECalComponent *	(*get_component) (ECalBackendStore *store, const gchar *uid, const gchar *rid);
-	gboolean	(*put_component) (ECalBackendStore *store, ECalComponent *comp);
-	gboolean	(*remove_component) (ECalBackendStore *store, const gchar *uid, const gchar *rid);
-	gboolean	(*has_component) (ECalBackendStore *store, const gchar *uid, const gchar *rid);
-
-	GSList *	(*get_components_by_uid) (ECalBackendStore *store, const gchar *uid);
-	GSList *	(*get_components) (ECalBackendStore *store);
-	GSList *	(*get_component_ids) (ECalBackendStore *store);
-
-	const icaltimezone *	(*get_timezone) (ECalBackendStore *store, const gchar *tzid);
-	gboolean	(*put_timezone) (ECalBackendStore *store, const icaltimezone *zone);
-	gboolean	(*remove_timezone) (ECalBackendStore *store, const gchar *tzid);
-
-	const icaltimezone *	(*get_default_timezone) (ECalBackendStore *store);
-	gboolean	(*set_default_timezone) (ECalBackendStore *store, const icaltimezone *zone);
-
-	void	(*thaw_changes) (ECalBackendStore *store);
-	void	(*freeze_changes) (ECalBackendStore *store);
-
-	const gchar *	(*get_key_value) (ECalBackendStore *store, const gchar *key);
-	gboolean	(*put_key_value) (ECalBackendStore *store, const gchar *key, const gchar *value);
-
-} ECalBackendStoreClass;
-
-GType e_cal_backend_store_get_type (void);
-
-const gchar *e_cal_backend_store_get_path (ECalBackendStore *store);
-
-gboolean		e_cal_backend_store_load (ECalBackendStore *store);
-gboolean		e_cal_backend_store_is_loaded (ECalBackendStore *store);
-gboolean		e_cal_backend_store_remove (ECalBackendStore *store);
-gboolean		e_cal_backend_store_clean (ECalBackendStore *store);
-ECalComponent *		e_cal_backend_store_get_component (ECalBackendStore *store, const gchar *uid, const gchar *rid);
-gboolean		e_cal_backend_store_put_component (ECalBackendStore *store, ECalComponent *comp);
-gboolean		e_cal_backend_store_remove_component (ECalBackendStore *store, const gchar *uid, const gchar *rid);
-gboolean		e_cal_backend_store_has_component (ECalBackendStore *store, const gchar *uid, const gchar *rid);
-const icaltimezone *	e_cal_backend_store_get_timezone (ECalBackendStore *store, const gchar *tzid);
-gboolean		e_cal_backend_store_put_timezone (ECalBackendStore *store, const icaltimezone *zone);
-gboolean		e_cal_backend_store_remove_timezone (ECalBackendStore *store, const gchar *tzid);
-const icaltimezone *	e_cal_backend_store_get_default_timezone (ECalBackendStore *store);
-gboolean		e_cal_backend_store_set_default_timezone (ECalBackendStore *store, const icaltimezone *zone);
-GSList *		e_cal_backend_store_get_components_by_uid (ECalBackendStore *store, const gchar *uid);
-GSList *		e_cal_backend_store_get_components (ECalBackendStore *store);
-GSList *		e_cal_backend_store_get_component_ids (ECalBackendStore *store);
-const gchar *		e_cal_backend_store_get_key_value (ECalBackendStore *store, const gchar *key);
-gboolean		e_cal_backend_store_put_key_value (ECalBackendStore *store, const gchar *key, const gchar *value);
-void			e_cal_backend_store_thaw_changes (ECalBackendStore *store);
-void			e_cal_backend_store_freeze_changes (ECalBackendStore *store);
+	gboolean	(*load)			(ECalBackendStore *store);
+	gboolean	(*remove)		(ECalBackendStore *store);
+	gboolean	(*clean)		(ECalBackendStore *store);
+	ECalComponent *	(*get_component)	(ECalBackendStore *store,
+						 const gchar *uid,
+						 const gchar *rid);
+	gboolean	(*put_component)	(ECalBackendStore *store,
+						 ECalComponent *comp);
+	gboolean	(*remove_component)	(ECalBackendStore *store,
+						 const gchar *uid,
+						 const gchar *rid);
+	gboolean	(*has_component)	(ECalBackendStore *store,
+						 const gchar *uid,
+						 const gchar *rid);
+	GSList *	(*get_components_by_uid)(ECalBackendStore *store,
+						 const gchar *uid);
+	GSList *	(*get_components)	(ECalBackendStore *store);
+	GSList *	(*get_component_ids)	(ECalBackendStore *store);
+	const icaltimezone *
+			(*get_timezone)		(ECalBackendStore *store,
+						 const gchar *tzid);
+	gboolean	(*put_timezone)		(ECalBackendStore *store,
+						 const icaltimezone *zone);
+	gboolean	(*remove_timezone)	(ECalBackendStore *store,
+						 const gchar *tzid);
+	const icaltimezone *
+			(*get_default_timezone)	(ECalBackendStore *store);
+	gboolean	(*set_default_timezone)	(ECalBackendStore *store,
+						 const icaltimezone *zone);
+	void		(*thaw_changes)		(ECalBackendStore *store);
+	void		(*freeze_changes)	(ECalBackendStore *store);
+	const gchar *	(*get_key_value)	(ECalBackendStore *store,
+						 const gchar *key);
+	gboolean	(*put_key_value)	(ECalBackendStore *store,
+						 const gchar *key,
+						 const gchar *value);
+};
+
+GType		e_cal_backend_store_get_type	(void);
+const gchar *	e_cal_backend_store_get_path	(ECalBackendStore *store);
+gboolean	e_cal_backend_store_load	(ECalBackendStore *store);
+gboolean	e_cal_backend_store_is_loaded	(ECalBackendStore *store);
+gboolean	e_cal_backend_store_remove	(ECalBackendStore *store);
+gboolean	e_cal_backend_store_clean	(ECalBackendStore *store);
+ECalComponent *	e_cal_backend_store_get_component
+						(ECalBackendStore *store,
+						 const gchar *uid,
+						 const gchar *rid);
+gboolean	e_cal_backend_store_put_component
+						(ECalBackendStore *store,
+						 ECalComponent *comp);
+gboolean	e_cal_backend_store_remove_component
+						(ECalBackendStore *store,
+						 const gchar *uid,
+						 const gchar *rid);
+gboolean	e_cal_backend_store_has_component
+						(ECalBackendStore *store,
+						 const gchar *uid,
+						 const gchar *rid);
+const icaltimezone *
+		e_cal_backend_store_get_timezone(ECalBackendStore *store,
+						 const gchar *tzid);
+gboolean	e_cal_backend_store_put_timezone(ECalBackendStore *store,
+						 const icaltimezone *zone);
+gboolean	e_cal_backend_store_remove_timezone
+						(ECalBackendStore *store,
+						 const gchar *tzid);
+const icaltimezone *	e_cal_backend_store_get_default_timezone
+						(ECalBackendStore *store);
+gboolean	e_cal_backend_store_set_default_timezone
+						(ECalBackendStore *store,
+						 const icaltimezone *zone);
+GSList *	e_cal_backend_store_get_components_by_uid
+						(ECalBackendStore *store,
+						 const gchar *uid);
+GSList *	e_cal_backend_store_get_components
+						(ECalBackendStore *store);
+GSList *	e_cal_backend_store_get_component_ids
+						(ECalBackendStore *store);
+const gchar *	e_cal_backend_store_get_key_value
+						(ECalBackendStore *store,
+						 const gchar *key);
+gboolean	e_cal_backend_store_put_key_value
+						(ECalBackendStore *store,
+						 const gchar *key,
+						 const gchar *value);
+void		e_cal_backend_store_thaw_changes(ECalBackendStore *store);
+void		e_cal_backend_store_freeze_changes
+						(ECalBackendStore *store);
 
 G_END_DECLS
 
-#endif /* _E_CAL_BACKEND_STORE */
+#endif /* E_CAL_BACKEND_STORE_H */