[evolution-kolab/ek-wip-porting] calendar: header include fixes

[Christian Hilberg <chilberg src gnome org>]

commit e4e662c28b39cefb1e2025586badf8dcf7374111
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Jun 15 18:18:45 2012 +0200

    calendar: header include fixes
    
    * Evo/E-D-S now enforce inclusion of only one
      header file for their libs

 src/calendar/e-cal-backend-kolab-factory.c |    2 +-
 src/calendar/e-cal-backend-kolab.c         |    4 +---
 src/calendar/e-cal-backend-kolab.h         |    2 +-
 src/calendar/kolab-util-calendar-cache.h   |    4 ++--
 src/calendar/kolab-util-calendar.c         |    3 ---
 src/calendar/kolab-util-calendar.h         |    4 ++--
 6 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/src/calendar/e-cal-backend-kolab-factory.c b/src/calendar/e-cal-backend-kolab-factory.c
index 2fd1d0a..d86500d 100644
--- a/src/calendar/e-cal-backend-kolab-factory.c
+++ b/src/calendar/e-cal-backend-kolab-factory.c
@@ -33,7 +33,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libedata-cal/e-cal-backend-factory.h>
+#include <libedata-cal/libedata-cal.h>
 #include <libekolabutil/kolab-util-camel.h>
 
 #include "e-cal-backend-kolab.h"
diff --git a/src/calendar/e-cal-backend-kolab.c b/src/calendar/e-cal-backend-kolab.c
index db0ead3..5661b79 100644
--- a/src/calendar/e-cal-backend-kolab.c
+++ b/src/calendar/e-cal-backend-kolab.c
@@ -29,9 +29,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include <libedata-cal/e-cal-backend-cache.h>
-#include <libedata-cal/e-data-cal-types.h>
-#include <libecal/e-cal.h>
+#include <libecal/libecal.h>
 
 #include <libical/ical.h>
 
diff --git a/src/calendar/e-cal-backend-kolab.h b/src/calendar/e-cal-backend-kolab.h
index 79f21ed..3a883f4 100644
--- a/src/calendar/e-cal-backend-kolab.h
+++ b/src/calendar/e-cal-backend-kolab.h
@@ -31,7 +31,7 @@
 /*----------------------------------------------------------------------------*/
 
 #include <glib-object.h>
-#include <libedata-cal/e-cal-backend-sync.h>
+#include <libedata-cal/libedata-cal.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/calendar/kolab-util-calendar-cache.h b/src/calendar/kolab-util-calendar-cache.h
index b5760b6..64a5a9b 100644
--- a/src/calendar/kolab-util-calendar-cache.h
+++ b/src/calendar/kolab-util-calendar-cache.h
@@ -35,8 +35,8 @@
 #include <gio/gio.h>
 
 #include <libekolab/kolab-mail-access.h>
-#include <libecal/e-cal.h>
-#include <libedata-cal/e-cal-backend-cache.h>
+#include <libecal/libecal.h>
+#include <libedata-cal/libedata-cal.h>
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/calendar/kolab-util-calendar.c b/src/calendar/kolab-util-calendar.c
index 2c394c0..d65a09b 100644
--- a/src/calendar/kolab-util-calendar.c
+++ b/src/calendar/kolab-util-calendar.c
@@ -25,9 +25,6 @@
 
 /*----------------------------------------------------------------------------*/
 
-#include <libecal/e-cal.h>
-#include <libedata-cal/e-data-cal-types.h>
-
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolab/kolab-settings-handler.h>
 #include <libekolab/kolab-mail-access.h>
diff --git a/src/calendar/kolab-util-calendar.h b/src/calendar/kolab-util-calendar.h
index 52e3b5c..f0a0940 100644
--- a/src/calendar/kolab-util-calendar.h
+++ b/src/calendar/kolab-util-calendar.h
@@ -33,8 +33,8 @@
 #include <gio/gio.h>
 
 #include <libical/icalcomponent.h>
-#include <libecal/e-cal.h>
-#include <libedata-cal/e-cal-backend-sync.h>
+#include <libecal/libecal.h>
+#include <libedata-cal/libedata-cal.h>
 
 #include <libekolabutil/kolab-util-http.h>
 #include <libekolab/kolab-settings-handler.h>