GNOME.org
 

[evolution-data-server] Adapt ECalBackendFile to libedata-cal changes.

commit ada2bd50e82b429e5ab63c2a267f95e0f8b41a37
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Sep 9 13:25:47 2011 -0400

    Adapt ECalBackendFile to libedata-cal changes.

 calendar/backends/file/Makefile.am                 |    1 -
 calendar/backends/file/e-cal-backend-file-events.h |   43 +++++----
 .../backends/file/e-cal-backend-file-factory.c     |  105 ++++----------------
 .../backends/file/e-cal-backend-file-factory.h     |   36 -------
 .../backends/file/e-cal-backend-file-journal.h     |   51 ++++++----
 calendar/backends/file/e-cal-backend-file-todos.h  |   43 +++++----
 calendar/backends/file/e-cal-backend-file.c        |   21 +---
 calendar/backends/file/e-cal-backend-file.h        |   53 ++++++-----
 8 files changed, 130 insertions(+), 223 deletions(-)
---
diff --git a/calendar/backends/file/Makefile.am b/calendar/backends/file/Makefile.am
index fe79080..d9ae106 100644
--- a/calendar/backends/file/Makefile.am
+++ b/calendar/backends/file/Makefile.am
@@ -13,7 +13,6 @@ noinst_PROGRAMS = test-interval-searches
 
 libecalbackendfile_la_SOURCES =		\
 	e-cal-backend-file-factory.c	\
-	e-cal-backend-file-factory.h	\
 	e-cal-backend-file-events.c	\
 	e-cal-backend-file-events.h	\
 	e-cal-backend-file-journal.c	\
diff --git a/calendar/backends/file/e-cal-backend-file-events.h b/calendar/backends/file/e-cal-backend-file-events.h
index 8a726a3..a55e77c 100644
--- a/calendar/backends/file/e-cal-backend-file-events.h
+++ b/calendar/backends/file/e-cal-backend-file-events.h
@@ -23,29 +23,32 @@
 
 #include "e-cal-backend-file.h"
 
-G_BEGIN_DECLS
-
-#define E_TYPE_CAL_BACKEND_FILE_EVENTS            (e_cal_backend_file_events_get_type ())
-#define E_CAL_BACKEND_FILE_EVENTS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_BACKEND_FILE_EVENTS,		\
-					  ECalBackendFileEvents))
-#define E_CAL_BACKEND_FILE_EVENTS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_BACKEND_FILE_EVENTS,	\
-					  ECalBackendFileEventsClass))
-#define E_IS_CAL_BACKEND_FILE_EVENTS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_BACKEND_FILE_EVENTS))
-#define E_IS_CAL_BACKEND_FILE_EVENTS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_BACKEND_FILE_EVENTS))
+/* Standard GObject macros */
+#define E_TYPE_CAL_BACKEND_FILE_EVENTS \
+	(e_cal_backend_file_events_get_type ())
+#define E_CAL_BACKEND_FILE_EVENTS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_BACKEND_FILE_EVENTS, ECalBackendFileEvents))
+#define E_CAL_BACKEND_FILE_EVENTS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_BACKEND_FILE_EVENTS, ECalBackendFileEventsClass))
+#define E_IS_CAL_BACKEND_FILE_EVENTS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_BACKEND_FILE_EVENTS))
+#define E_IS_CAL_BACKEND_FILE_EVENTS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_BACKEND_FILE_EVENTS))
+#define E_CAL_BACKEND_FILE_EVENTS_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_BACKEND_FILE_EVENTS, ECalBackendFileEventsClass))
 
-typedef struct _ECalBackendFileEvents ECalBackendFileEvents;
-typedef struct _ECalBackendFileEventsClass ECalBackendFileEventsClass;
-
-struct _ECalBackendFileEvents {
-	ECalBackendFile backend;
-};
+G_BEGIN_DECLS
 
-struct _ECalBackendFileEventsClass {
-	ECalBackendFileClass parent_class;
-};
+typedef ECalBackendFile ECalBackendFileEvents;
+typedef ECalBackendFileClass ECalBackendFileEventsClass;
 
-GType e_cal_backend_file_events_get_type (void);
+GType		e_cal_backend_file_events_get_type	(void);
 
 G_END_DECLS
 
-#endif
+#endif /* E_CAL_BACKEND_FILE_EVENTS_H */
diff --git a/calendar/backends/file/e-cal-backend-file-factory.c b/calendar/backends/file/e-cal-backend-file-factory.c
index ee93e15..89d5add 100644
--- a/calendar/backends/file/e-cal-backend-file-factory.c
+++ b/calendar/backends/file/e-cal-backend-file-factory.c
@@ -7,17 +7,15 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
-#include <string.h>
-
-#include "e-cal-backend-file-factory.h"
+#include <libedata-cal/e-cal-backend-factory.h>
 #include "e-cal-backend-file-events.h"
 #include "e-cal-backend-file-journal.h"
 #include "e-cal-backend-file-todos.h"
 
+#define FACTORY_NAME "local"
+
 typedef ECalBackendFactory ECalBackendFileEventsFactory;
 typedef ECalBackendFactoryClass ECalBackendFileEventsFactoryClass;
 
@@ -27,6 +25,10 @@ typedef ECalBackendFactoryClass ECalBackendFileJournalFactoryClass;
 typedef ECalBackendFactory ECalBackendFileTodosFactory;
 typedef ECalBackendFactoryClass ECalBackendFileTodosFactoryClass;
 
+/* Module Entry Points */
+void e_module_load (GTypeModule *type_module);
+void e_module_unload (GTypeModule *type_module);
+
 /* Forward Declarations */
 GType e_cal_backend_file_events_factory_get_type (void);
 GType e_cal_backend_file_journal_factory_get_type (void);
@@ -47,66 +49,12 @@ G_DEFINE_DYNAMIC_TYPE (
 	e_cal_backend_file_todos_factory,
 	E_TYPE_CAL_BACKEND_FACTORY)
 
-static const gchar *
-_get_protocol (ECalBackendFactory *factory)
-{
-	return "local";
-}
-
-static icalcomponent_kind
-_events_get_kind (ECalBackendFactory *factory)
-{
-	return ICAL_VEVENT_COMPONENT;
-}
-
-static ECalBackend *
-_events_new_backend (ECalBackendFactory *factory,
-                     ESource *source)
-{
-	return g_object_new (
-		e_cal_backend_file_events_get_type (),
-		"kind", ICAL_VEVENT_COMPONENT,
-		"source", source, NULL);
-}
-
-static icalcomponent_kind
-_journal_get_kind (ECalBackendFactory *factory)
-{
-	return ICAL_VJOURNAL_COMPONENT;
-}
-
-static ECalBackend *
-_journal_new_backend (ECalBackendFactory *factory,
-                      ESource *source)
-{
-	return g_object_new (
-		e_cal_backend_file_journal_get_type (),
-		"kind", ICAL_VJOURNAL_COMPONENT,
-		"source", source, NULL);
-}
-
-static icalcomponent_kind
-_todos_get_kind (ECalBackendFactory *factory)
-{
-	return ICAL_VTODO_COMPONENT;
-}
-
-static ECalBackend *
-_todos_new_backend (ECalBackendFactory *factory,
-                    ESource *source)
-{
-	return g_object_new (
-		e_cal_backend_file_todos_get_type (),
-		"kind", ICAL_VTODO_COMPONENT,
-		"source", source, NULL);
-}
-
 static void
 e_cal_backend_file_events_factory_class_init (ECalBackendFactoryClass *class)
 {
-	class->get_protocol = _get_protocol;
-	class->get_kind     = _events_get_kind;
-	class->new_backend  = _events_new_backend;
+	class->factory_name = FACTORY_NAME;
+	class->component_kind = ICAL_VEVENT_COMPONENT;
+	class->backend_type = E_TYPE_CAL_BACKEND_FILE_EVENTS;
 }
 
 static void
@@ -122,9 +70,9 @@ e_cal_backend_file_events_factory_init (ECalBackendFactory *factory)
 static void
 e_cal_backend_file_journal_factory_class_init (ECalBackendFactoryClass *class)
 {
-	class->get_protocol = _get_protocol;
-	class->get_kind     = _journal_get_kind;
-	class->new_backend  = _journal_new_backend;
+	class->factory_name = FACTORY_NAME;
+	class->component_kind = ICAL_VJOURNAL_COMPONENT;
+	class->backend_type = E_TYPE_CAL_BACKEND_FILE_JOURNAL;
 }
 
 static void
@@ -140,9 +88,9 @@ e_cal_backend_file_journal_factory_init (ECalBackendFactory *factory)
 static void
 e_cal_backend_file_todos_factory_class_init (ECalBackendFactoryClass *class)
 {
-	class->get_protocol = _get_protocol;
-	class->get_kind     = _todos_get_kind;
-	class->new_backend  = _todos_new_backend;
+	class->factory_name = FACTORY_NAME;
+	class->component_kind = ICAL_VTODO_COMPONENT;
+	class->backend_type = E_TYPE_CAL_BACKEND_FILE_TODOS;
 }
 
 static void
@@ -155,29 +103,16 @@ e_cal_backend_file_todos_factory_init (ECalBackendFactory *factory)
 {
 }
 
-void
-eds_module_initialize (GTypeModule *type_module)
+G_MODULE_EXPORT void
+e_module_load (GTypeModule *type_module)
 {
 	e_cal_backend_file_events_factory_register_type (type_module);
 	e_cal_backend_file_journal_factory_register_type (type_module);
 	e_cal_backend_file_todos_factory_register_type (type_module);
 }
 
-void
-eds_module_shutdown (void)
+G_MODULE_EXPORT void
+e_module_unload (GTypeModule *type_module)
 {
 }
 
-void
-eds_module_list_types (const GType **types,
-                       gint *num_types)
-{
-	static GType file_types[3];
-
-	file_types[0] = e_cal_backend_file_events_factory_get_type ();
-	file_types[1] = e_cal_backend_file_journal_factory_get_type ();
-	file_types[2] = e_cal_backend_file_todos_factory_get_type ();
-
-	*types = file_types;
-	*num_types = G_N_ELEMENTS (file_types);
-}
diff --git a/calendar/backends/file/e-cal-backend-file-journal.h b/calendar/backends/file/e-cal-backend-file-journal.h
index b59c2e2..cfb524b 100644
--- a/calendar/backends/file/e-cal-backend-file-journal.h
+++ b/calendar/backends/file/e-cal-backend-file-journal.h
@@ -23,25 +23,32 @@
 
 #include "e-cal-backend-file.h"
 
-#define E_TYPE_CAL_BACKEND_FILE_JOURNAL            (e_cal_backend_file_journal_get_type ())
-#define E_CAL_BACKEND_FILE_JOURNAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_BACKEND_FILE_JOURNAL,		\
-					  ECalBackendFileJournal))
-#define E_CAL_BACKEND_FILE_JOURNAL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_BACKEND_FILE_JOURNAL,	\
-					  ECalBackendFileJournalClass))
-#define E_IS_CAL_BACKEND_FILE_JOURNAL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_BACKEND_FILE_JOURNAL))
-#define E_IS_CAL_BACKEND_FILE_JOURNAL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_BACKEND_FILE_JOURNAL))
-
-typedef struct _ECalBackendFileJournal ECalBackendFileJournal;
-typedef struct _ECalBackendFileJournalClass ECalBackendFileJournalClass;
-
-struct _ECalBackendFileJournal {
-	ECalBackendFile backend;
-};
-
-struct _ECalBackendFileJournalClass {
-	ECalBackendFileClass parent_class;
-};
-
-GType e_cal_backend_file_journal_get_type (void);
-
-#endif
+/* Standard GObject macros */
+#define E_TYPE_CAL_BACKEND_FILE_JOURNAL \
+	(e_cal_backend_file_journal_get_type ())
+#define E_CAL_BACKEND_FILE_JOURNAL(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_BACKEND_FILE_JOURNAL, ECalBackendFileJournal))
+#define E_CAL_BACKEND_FILE_JOURNAL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_BACKEND_FILE_JOURNAL, ECalBackendFileJournalClass))
+#define E_IS_CAL_BACKEND_FILE_JOURNAL(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_BACKEND_FILE_JOURNAL))
+#define E_IS_CAL_BACKEND_FILE_JOURNAL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_BACKEND_FILE_JOURNAL))
+#define E_CAL_BACKEND_FILE_JOURNAL_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_BACKEND_FILE_JOURNAL, ECalBackendFileJournalClass))
+
+G_BEGIN_DECLS
+
+typedef ECalBackendFile ECalBackendFileJournal;
+typedef ECalBackendFileClass ECalBackendFileJournalClass;
+
+GType		e_cal_backend_file_journal_get_type	(void);
+
+G_END_DECLS
+
+#endif /* E_CAL_BACKEND_FILE_JOURNAL_H */
diff --git a/calendar/backends/file/e-cal-backend-file-todos.h b/calendar/backends/file/e-cal-backend-file-todos.h
index 0a04063..0a2a0d8 100644
--- a/calendar/backends/file/e-cal-backend-file-todos.h
+++ b/calendar/backends/file/e-cal-backend-file-todos.h
@@ -23,29 +23,32 @@
 
 #include "e-cal-backend-file.h"
 
-G_BEGIN_DECLS
-
-#define E_TYPE_CAL_BACKEND_FILE_TODOS            (e_cal_backend_file_todos_get_type ())
-#define E_CAL_BACKEND_FILE_TODOS(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_BACKEND_FILE_TODOS,		\
-					  ECalBackendFileTodos))
-#define E_CAL_BACKEND_FILE_TODOS_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_BACKEND_FILE_TODOS,	\
-					  ECalBackendFileTodosClass))
-#define E_IS_CAL_BACKEND_FILE_TODOS(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_BACKEND_FILE_TODOS))
-#define E_IS_CAL_BACKEND_FILE_TODOS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_BACKEND_FILE_TODOS))
+/* Standard GObject macros */
+#define E_TYPE_CAL_BACKEND_FILE_TODOS \
+	(e_cal_backend_file_todos_get_type ())
+#define E_CAL_BACKEND_FILE_TODOS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_BACKEND_FILE_TODOS, ECalBackendFileTodos))
+#define E_CAL_BACKEND_FILE_TODOS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_BACKEND_FILE_TODOS, ECalBackendFileTodosClass))
+#define E_IS_CAL_BACKEND_FILE_TODOS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_BACKEND_FILE_TODOS))
+#define E_IS_CAL_BACKEND_FILE_TODOS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_BACKEND_FILE_TODOS))
+#define E_CAL_BACKEND_FILE_TODOS_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_BACKEND_FILE_TODOS, ECalBackendFileTodosClass))
 
-typedef struct _ECalBackendFileTodos ECalBackendFileTodos;
-typedef struct _ECalBackendFileTodosClass ECalBackendFileTodosClass;
-
-struct _ECalBackendFileTodos {
-	ECalBackendFile backend;
-};
+G_BEGIN_DECLS
 
-struct _ECalBackendFileTodosClass {
-	ECalBackendFileClass parent_class;
-};
+typedef ECalBackendFile ECalBackendFileTodos;
+typedef ECalBackendFileClass ECalBackendFileTodosClass;
 
-GType e_cal_backend_file_todos_get_type (void);
+GType		e_cal_backend_file_todos_get_type	(void);
 
 G_END_DECLS
 
-#endif
+#endif /* E_CAL_BACKEND_FILE_TODOS_H */
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 5002ab4..dbdb87f 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -318,7 +318,7 @@ e_cal_backend_file_dispose (GObject *object)
 
 	free_calendar_data (cbfile);
 
-	source = e_cal_backend_get_source (E_CAL_BACKEND (cbfile));
+	source = e_backend_get_source (E_BACKEND (cbfile));
 	if (source)
 		g_signal_handlers_disconnect_matched (source, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, cbfile);
 
@@ -792,7 +792,7 @@ uri_to_path (ECalBackend *backend)
 
 	cache_dir = e_cal_backend_get_cache_dir (backend);
 
-	source = e_cal_backend_get_source (backend);
+	source = e_backend_get_source (E_BACKEND (backend));
 	if (source && e_source_get_property (source, "custom-file")) {
 		const gchar *property;
 
@@ -918,7 +918,7 @@ prepare_refresh_data (ECalBackendFile *cbfile)
 	priv->refresh_thread_stop = FALSE;
 	priv->refresh_skip = 0;
 
-	source = e_cal_backend_get_source (E_CAL_BACKEND (cbfile));
+	source = e_backend_get_source (E_BACKEND (cbfile));
 	value = e_source_get_property (source, "refresh-type");
 	if (e_source_get_property (source, "custom-file") && value && *value && !value[1]) {
 		GFile *file;
@@ -1329,7 +1329,7 @@ e_cal_backend_file_open (ECalBackendSync *backend,
 		if (!priv->read_only) {
 			ESource *source;
 
-			source = e_cal_backend_get_source (E_CAL_BACKEND (backend));
+			source = e_backend_get_source (E_BACKEND (backend));
 
 			g_signal_connect (
 				source, "changed",
@@ -1435,14 +1435,6 @@ e_cal_backend_file_remove (ECalBackendSync *backend,
 		g_error_free (local_error);
 }
 
-/* Set_mode handler for the file backend */
-static void
-e_cal_backend_file_set_online (ECalBackend *backend,
-                               gboolean is_online)
-{
-	e_cal_backend_notify_online (backend, TRUE);
-}
-
 static void
 add_detached_recur_to_vcalendar (gpointer key,
                                  gpointer value,
@@ -3305,7 +3297,7 @@ cal_backend_file_constructed (GObject *object)
 
 	backend = E_CAL_BACKEND (object);
 	kind = e_cal_backend_get_kind (backend);
-	source = e_cal_backend_get_source (backend);
+	source = e_backend_get_source (E_BACKEND (backend));
 
 	switch (kind) {
 		case ICAL_VEVENT_COMPONENT:
@@ -3372,7 +3364,6 @@ e_cal_backend_file_class_init (ECalBackendFileClass *class)
 	sync_class->get_free_busy_sync		= e_cal_backend_file_get_free_busy;
 
 	backend_class->start_view		= e_cal_backend_file_start_view;
-	backend_class->set_online		= e_cal_backend_file_set_online;
 	backend_class->internal_get_timezone	= e_cal_backend_file_internal_get_timezone;
 }
 
@@ -3440,7 +3431,7 @@ e_cal_backend_file_reload (ECalBackendFile *cbfile,
 	if (!err && !priv->read_only) {
 		ESource *source;
 
-		source = e_cal_backend_get_source (E_CAL_BACKEND (cbfile));
+		source = e_backend_get_source (E_BACKEND (cbfile));
 
 		if (e_source_get_property (source, "custom-file-readonly") && g_str_equal (e_source_get_property (source, "custom-file-readonly"), "1"))
 			priv->read_only = TRUE;
diff --git a/calendar/backends/file/e-cal-backend-file.h b/calendar/backends/file/e-cal-backend-file.h
index 68a7773..be34eb0 100644
--- a/calendar/backends/file/e-cal-backend-file.h
+++ b/calendar/backends/file/e-cal-backend-file.h
@@ -23,27 +23,33 @@
 
 #include <libedata-cal/e-cal-backend-sync.h>
 
-G_BEGIN_DECLS
-
-
+/* Standard GObject macros */
+#define E_TYPE_CAL_BACKEND_FILE \
+	(e_cal_backend_file_get_type ())
+#define E_CAL_BACKEND_FILE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CAL_BACKEND_FILE, ECalBackendFile))
+#define E_CAL_BACKEND_FILE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CAL_BACKEND_FILE, ECalBackendFileClass))
+#define E_IS_CAL_BACKEND_FILE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CAL_BACKEND_FILE))
+#define E_IS_CAL_BACKEND_FILE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CAL_BACKEND_FILE))
+#define E_CAL_BACKEND_FILE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CAL_BACKEND_FILE, ECalBackendFileClass))
 
-#define E_TYPE_CAL_BACKEND_FILE            (e_cal_backend_file_get_type ())
-#define E_CAL_BACKEND_FILE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_CAL_BACKEND_FILE,		\
-					  ECalBackendFile))
-#define E_CAL_BACKEND_FILE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_CAL_BACKEND_FILE,	\
-					  ECalBackendFileClass))
-#define E_IS_CAL_BACKEND_FILE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CAL_BACKEND_FILE))
-#define E_IS_CAL_BACKEND_FILE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_CAL_BACKEND_FILE))
+G_BEGIN_DECLS
 
 typedef struct _ECalBackendFile ECalBackendFile;
 typedef struct _ECalBackendFileClass ECalBackendFileClass;
-
 typedef struct _ECalBackendFilePrivate ECalBackendFilePrivate;
 
 struct _ECalBackendFile {
-	ECalBackendSync backend;
-
-	/* Private data */
+	ECalBackendSync parent;
 	ECalBackendFilePrivate *priv;
 };
 
@@ -51,16 +57,15 @@ struct _ECalBackendFileClass {
 	ECalBackendSyncClass parent_class;
 };
 
-GType                  e_cal_backend_file_get_type      (void);
-
-void                   e_cal_backend_file_set_file_name (ECalBackendFile *cbfile,
-							 const gchar     *file_name);
-const gchar            *e_cal_backend_file_get_file_name (ECalBackendFile *cbfile);
-
-void			e_cal_backend_file_reload        (ECalBackendFile *cbfile, GError **error);
-
-
+GType		e_cal_backend_file_get_type	(void);
+const gchar *	e_cal_backend_file_get_file_name
+						(ECalBackendFile *cbfile);
+void		e_cal_backend_file_set_file_name
+						(ECalBackendFile *cbfile,
+						 const gchar *file_name);
+void		e_cal_backend_file_reload	(ECalBackendFile *cbfile,
+						 GError **error);
 
 G_END_DECLS
 
-#endif
+#endif /* E_CAL_BACKEND_FILE_H */
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]