[evolution-data-server] Remove e-data-cal-common.h.

[Matthew Barnes <mbarnes src gnome org>]

commit 4962213b99b887031b357d620dd4b6983931c1e6
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sat Oct 6 16:24:37 2012 -0400

    Remove e-data-cal-common.h.
    
    Keep type defintions where they belong.

 calendar/libedata-cal/Makefile.am          |    1 -
 calendar/libedata-cal/e-cal-backend-sexp.h |    8 +++-
 calendar/libedata-cal/e-cal-backend.h      |    4 +-
 calendar/libedata-cal/e-data-cal-common.h  |   50 ----------------------------
 calendar/libedata-cal/e-data-cal-view.h    |   13 ++++---
 calendar/libedata-cal/e-data-cal.c         |    2 +
 calendar/libedata-cal/e-data-cal.h         |   10 ++++--
 calendar/libedata-cal/libedata-cal.h       |    1 -
 8 files changed, 25 insertions(+), 64 deletions(-)
---
diff --git a/calendar/libedata-cal/Makefile.am b/calendar/libedata-cal/Makefile.am
index b26ebb7..7c9fc56 100644
--- a/calendar/libedata-cal/Makefile.am
+++ b/calendar/libedata-cal/Makefile.am
@@ -55,7 +55,6 @@ libedata_calinclude_HEADERS = 		\
 	e-cal-backend-util.h		\
 	e-cal-backend-sexp.h		\
 	e-data-cal.h			\
-	e-data-cal-common.h		\
 	e-data-cal-factory.h		\
 	e-cal-backend-store.h		\
 	e-cal-backend-file-store.h	\
diff --git a/calendar/libedata-cal/e-cal-backend-sexp.h b/calendar/libedata-cal/e-cal-backend-sexp.h
index bec491b..4bb82f9 100644
--- a/calendar/libedata-cal/e-cal-backend-sexp.h
+++ b/calendar/libedata-cal/e-cal-backend-sexp.h
@@ -41,6 +41,10 @@
 
 G_BEGIN_DECLS
 
+struct _ECalBackend;
+
+typedef struct _ECalBackendSExp ECalBackendSExp;
+typedef struct _ECalBackendSExpClass ECalBackendSExpClass;
 typedef struct _ECalBackendSExpPrivate ECalBackendSExpPrivate;
 
 struct _ECalBackendSExp {
@@ -60,10 +64,10 @@ const gchar      *e_cal_backend_sexp_text         (ECalBackendSExp *sexp);
 
 gboolean         e_cal_backend_sexp_match_object (ECalBackendSExp *sexp,
 						  const gchar      *object,
-						  ECalBackend     *backend);
+						  struct _ECalBackend *backend);
 gboolean         e_cal_backend_sexp_match_comp   (ECalBackendSExp *sexp,
 						  ECalComponent   *comp,
-						  ECalBackend     *backend);
+						  struct _ECalBackend *backend);
 
 /* Default implementations of time functions for use by subclasses */
 
diff --git a/calendar/libedata-cal/e-cal-backend.h b/calendar/libedata-cal/e-cal-backend.h
index cbad945..dba8678 100644
--- a/calendar/libedata-cal/e-cal-backend.h
+++ b/calendar/libedata-cal/e-cal-backend.h
@@ -30,8 +30,6 @@
 #include <libecal/libecal.h>
 #include <libebackend/libebackend.h>
 
-#include "e-data-cal-common.h"
-#include <libedata-cal/e-data-cal-common.h>
 #include <libedata-cal/e-data-cal.h>
 
 G_BEGIN_DECLS
@@ -139,6 +137,8 @@ G_BEGIN_DECLS
 
 struct _ECalBackendCache;
 
+typedef struct _ECalBackend ECalBackend;
+typedef struct _ECalBackendClass ECalBackendClass;
 typedef struct _ECalBackendPrivate ECalBackendPrivate;
 
 struct _ECalBackend {
diff --git a/calendar/libedata-cal/e-data-cal-view.h b/calendar/libedata-cal/e-data-cal-view.h
index 76e6339..5211f9a 100644
--- a/calendar/libedata-cal/e-data-cal-view.h
+++ b/calendar/libedata-cal/e-data-cal-view.h
@@ -27,9 +27,6 @@
 
 #include <libecal/libecal.h>
 
-#include <libedata-cal/e-data-cal-common.h>
-#include <libedata-cal/e-cal-backend-sexp.h>
-
 G_BEGIN_DECLS
 
 
@@ -39,6 +36,11 @@ G_BEGIN_DECLS
 #define E_DATA_CAL_VIEW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_DATA_CAL_VIEW_TYPE, EDataCalViewClass))
 #define E_IS_DATA_CAL_VIEW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_DATA_CAL_VIEW_TYPE))
 
+struct _ECalBackend;
+struct _ECalBackendSExp;
+
+typedef struct _EDataCalView EDataCalView;
+typedef struct _EDataCalViewClass EDataCalViewClass;
 typedef struct _EDataCalViewPrivate EDataCalViewPrivate;
 
 struct _EDataCalView {
@@ -51,10 +53,11 @@ struct _EDataCalViewClass {
 };
 
 GType			e_data_cal_view_get_type			(void);
-EDataCalView *		e_data_cal_view_new				(ECalBackend *backend, ECalBackendSExp *sexp);
+EDataCalView *		e_data_cal_view_new				(struct _ECalBackend *backend, struct _ECalBackendSExp *sexp);
 guint			e_data_cal_view_register_gdbus_object		(EDataCalView *view, GDBusConnection *connection, const gchar *object_path, GError **error);
 const gchar *		e_data_cal_view_get_text			(EDataCalView *view);
-ECalBackendSExp *	e_data_cal_view_get_object_sexp			(EDataCalView *view);
+struct _ECalBackendSExp *
+			e_data_cal_view_get_object_sexp			(EDataCalView *view);
 gboolean		e_data_cal_view_object_matches			(EDataCalView *view, const gchar *object);
 gboolean		e_data_cal_view_component_matches		(EDataCalView *view, ECalComponent *component);
 gboolean		e_data_cal_view_is_started			(EDataCalView *view);
diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index 7ffc40e..69a9e8d 100644
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -34,6 +34,8 @@
 
 #include "e-data-cal.h"
 #include "e-gdbus-cal.h"
+#include "e-cal-backend.h"
+#include "e-cal-backend-sexp.h"
 
 #define E_DATA_CAL_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/calendar/libedata-cal/e-data-cal.h b/calendar/libedata-cal/e-data-cal.h
index 29b10b2..cc4ad52 100644
--- a/calendar/libedata-cal/e-data-cal.h
+++ b/calendar/libedata-cal/e-data-cal.h
@@ -28,7 +28,6 @@
 #define E_DATA_CAL_H
 
 #include <gio/gio.h>
-#include <libedata-cal/e-data-cal-common.h>
 #include <libedata-cal/e-data-cal-view.h>
 
 G_BEGIN_DECLS
@@ -114,6 +113,10 @@ const gchar *e_data_cal_status_to_string (EDataCalCallStatus status);
 		}								\
 	} G_STMT_END
 
+struct _ECalBackend;
+
+typedef struct _EDataCal EDataCal;
+typedef struct _EDataCalClass EDataCalClass;
 typedef struct _EDataCalPrivate EDataCalPrivate;
 
 struct _EDataCal {
@@ -127,8 +130,9 @@ struct _EDataCalClass {
 
 GType e_data_cal_get_type (void);
 
-EDataCal *	e_data_cal_new					(ECalBackend *backend);
-ECalBackend *	e_data_cal_get_backend				(EDataCal *cal);
+EDataCal *	e_data_cal_new					(struct _ECalBackend *backend);
+struct _ECalBackend *
+		e_data_cal_get_backend				(EDataCal *cal);
 guint		e_data_cal_register_gdbus_object		(EDataCal *cal, GDBusConnection *connection, const gchar *object_path, GError **error);
 
 void		e_data_cal_respond_open				(EDataCal *cal, guint32 opid, GError *error);
diff --git a/calendar/libedata-cal/libedata-cal.h b/calendar/libedata-cal/libedata-cal.h
index 60a4c25..3c8158a 100644
--- a/calendar/libedata-cal/libedata-cal.h
+++ b/calendar/libedata-cal/libedata-cal.h
@@ -33,7 +33,6 @@
 #include <libedata-cal/e-cal-backend-store.h>
 #include <libedata-cal/e-cal-backend-sync.h>
 #include <libedata-cal/e-cal-backend-util.h>
-#include <libedata-cal/e-data-cal-common.h>
 #include <libedata-cal/e-data-cal-factory.h>
 #include <libedata-cal/e-data-cal.h>
 #include <libedata-cal/e-data-cal-view.h>