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

[Christian Hilberg <chilberg src gnome org>]

commit 5c8aab89704bf04c9740ea697359e582e24bf61f
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Jun 15 17:53:23 2012 +0200

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

 src/addressbook/e-book-backend-kolab.c     |    4 ----
 src/addressbook/e-book-backend-kolab.h     |    2 +-
 src/addressbook/kolab-util-contact-cache.c |    2 +-
 src/addressbook/kolab-util-contact-cache.h |   10 +++++-----
 src/addressbook/kolab-util-contact.c       |    3 +--
 src/addressbook/kolab-util-contact.h       |    5 ++---
 6 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-kolab.c b/src/addressbook/e-book-backend-kolab.c
index a3b8765..8a1688a 100644
--- a/src/addressbook/e-book-backend-kolab.c
+++ b/src/addressbook/e-book-backend-kolab.c
@@ -29,10 +29,6 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libedata-book/e-data-book-view.h>
-#include <libedata-book/e-book-backend-sync.h>
-#include <libedata-book/e-book-backend-cache.h>
-
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolabutil/kolab-util-camel.h>
 #include <libekolabutil/kolab-util-http.h>
diff --git a/src/addressbook/e-book-backend-kolab.h b/src/addressbook/e-book-backend-kolab.h
index fe228f0..e371660 100644
--- a/src/addressbook/e-book-backend-kolab.h
+++ b/src/addressbook/e-book-backend-kolab.h
@@ -35,7 +35,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#include <libedata-book/e-book-backend-sync.h>
+#include <libedata-book/libedata-book.h>
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/addressbook/kolab-util-contact-cache.c b/src/addressbook/kolab-util-contact-cache.c
index 4e6a0d8..73977af 100644
--- a/src/addressbook/kolab-util-contact-cache.c
+++ b/src/addressbook/kolab-util-contact-cache.c
@@ -30,7 +30,7 @@
 
 #include <libekolabutil/kolab-util-glib.h>
 
-#include <libecal/e-cal.h>
+#include <libecal/libecal.h>
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/addressbook/kolab-util-contact-cache.h b/src/addressbook/kolab-util-contact-cache.h
index 50bda91..e9c4b0a 100644
--- a/src/addressbook/kolab-util-contact-cache.h
+++ b/src/addressbook/kolab-util-contact-cache.h
@@ -35,12 +35,12 @@
 
 #include <libekolab/kolab-mail-access.h>
 
-#include <libedata-book/e-book-backend-cache.h>
+#include <libedata-book/libedata-book.h>
 
 /*----------------------------------------------------------------------------*/
 
 gboolean
-kolab_util_contact_cache_assure_uid_on_econtact (EBookBackendCache *cache, 
+kolab_util_contact_cache_assure_uid_on_econtact (EBookBackendCache *cache,
                                                  KolabMailAccess *koma,
                                                  EContact *econtact,
                                                  const gchar *uri,
@@ -49,9 +49,9 @@ kolab_util_contact_cache_assure_uid_on_econtact (EBookBackendCache *cache,
                                                  GError **error);
 
 EContact*
-kolab_util_contact_cache_get_object (EBookBackendCache *cache, 
-                                     KolabMailAccess *koma, 
-                                     const gchar *uri, 
+kolab_util_contact_cache_get_object (EBookBackendCache *cache,
+                                     KolabMailAccess *koma,
+                                     const gchar *uri,
                                      const gchar *uid,
                                      gboolean bulk,
                                      GCancellable *cancellable,
diff --git a/src/addressbook/kolab-util-contact.c b/src/addressbook/kolab-util-contact.c
index cac4536..9b2bee7 100644
--- a/src/addressbook/kolab-util-contact.c
+++ b/src/addressbook/kolab-util-contact.c
@@ -27,8 +27,7 @@
 
 #include <libekolab/kolab-mail-access.h>
 
-#include <libebook/e-contact.h>
-#include <libecal/e-cal.h>
+#include <libecal/libecal.h>
 
 #include "kolab-util-contact.h"
 
diff --git a/src/addressbook/kolab-util-contact.h b/src/addressbook/kolab-util-contact.h
index 154e6bb..cc3c8ce 100644
--- a/src/addressbook/kolab-util-contact.h
+++ b/src/addressbook/kolab-util-contact.h
@@ -34,9 +34,8 @@
 #include <gio/gio.h>
 #include <glib-object.h>
 
-#include <libebook/e-contact.h>
-#include <libedata-book/e-data-book-types.h>
-#include <libedata-book/e-book-backend-sync.h>
+#include <libebook/libebook.h>
+#include <libedata-book/libedata-book.h>
 
 #include <libekolab/kolab-mail-access.h>