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

[Christian Hilberg <chilberg src gnome org>]

commit 7d7a233c5b45dad40350e1135d795218c7fd525d
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Fri Jun 15 15:58:42 2012 +0200

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

 src/libekolab/kolab-mail-handle.h       |   10 +++++-----
 src/libekolab/kolab-mail-summary.h      |    4 ++--
 src/libekolab/kolab-mail-synchronizer.c |    2 +-
 src/libekolab/kolab-settings-handler.c  |    2 +-
 src/libekolab/kolab-util-backend.c      |    1 -
 src/libekolab/kolab-util-backend.h      |    6 +++---
 6 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/src/libekolab/kolab-mail-handle.h b/src/libekolab/kolab-mail-handle.h
index d78db85..a7be36f 100644
--- a/src/libekolab/kolab-mail-handle.h
+++ b/src/libekolab/kolab-mail-handle.h
@@ -12,17 +12,17 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
  */
- 
+
 /*----------------------------------------------------------------------------*/
 
 /**
@@ -70,8 +70,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <libebook/e-contact.h>
-#include <libecal/e-cal-component.h>
+#include <libebook/libebook.h>
+#include <libecal/libecal.h>
 
 #include  <libekolabconv/main/src/kolab-conv.h>
 
diff --git a/src/libekolab/kolab-mail-summary.h b/src/libekolab/kolab-mail-summary.h
index c2f59a9..2517769 100644
--- a/src/libekolab/kolab-mail-summary.h
+++ b/src/libekolab/kolab-mail-summary.h
@@ -47,8 +47,8 @@
 
 #include <glib.h>
 
-#include <libebook/e-contact.h>
-#include <libecal/e-cal-component.h>
+#include <libebook/libebook.h>
+#include <libecal/libecal.h>
 
 /*----------------------------------------------------------------------------*/
 
diff --git a/src/libekolab/kolab-mail-synchronizer.c b/src/libekolab/kolab-mail-synchronizer.c
index 0fdff4f..a8f0c67 100644
--- a/src/libekolab/kolab-mail-synchronizer.c
+++ b/src/libekolab/kolab-mail-synchronizer.c
@@ -31,7 +31,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <libecal/e-cal-time-util.h>
+#include <libecal/libecal.h>
 
 #include <libekolabutil/kolab-util-glib.h>
 #include <libekolabutil/kolab-util-folder.h>
diff --git a/src/libekolab/kolab-settings-handler.c b/src/libekolab/kolab-settings-handler.c
index b19afac..52b92ab 100644
--- a/src/libekolab/kolab-settings-handler.c
+++ b/src/libekolab/kolab-settings-handler.c
@@ -31,7 +31,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <libedataserver/e-data-server-util.h>
+#include <libedataserver/libedataserver.h>
 #include <libekolabutil/kolab-util-camel.h>
 #include <libekolabutil/kolab-util-glib.h>
 
diff --git a/src/libekolab/kolab-util-backend.c b/src/libekolab/kolab-util-backend.c
index a757cf2..18163d8 100644
--- a/src/libekolab/kolab-util-backend.c
+++ b/src/libekolab/kolab-util-backend.c
@@ -33,7 +33,6 @@
 #include <glib/gi18n-lib.h>
 
 #include <libical/ical.h>
-#include <libedataserver/e-source.h>
 
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolabutil/kolab-util-camel.h>
diff --git a/src/libekolab/kolab-util-backend.h b/src/libekolab/kolab-util-backend.h
index cd55fb5..fa0cf51 100644
--- a/src/libekolab/kolab-util-backend.h
+++ b/src/libekolab/kolab-util-backend.h
@@ -33,9 +33,9 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include <libebook/e-contact.h>
-#include <libecal/e-cal-component.h>
-#include <libedataserver/e-source.h>
+#include <libebook/libebook.h>
+#include <libecal/libecal.h>
+#include <libedataserver/libedataserver.h>
 
 #include <libekolabutil/camel-system-headers.h>
 #include <libekolabutil/kolab-util-sqlite.h>