From 2a39437ee94059a79d3dc1bf0c97a3aeaff23f53 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 3 Jun 2012 15:14:03 -0400
Subject: Adapt to single-include E-D-S libraries.

---
 modules/cal-config-caldav/e-caldav-chooser.c            | 7 +------
 modules/cal-config-caldav/e-caldav-chooser.h            | 3 +--
 modules/cal-config-caldav/evolution-cal-config-caldav.c | 5 +----
 3 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'modules/cal-config-caldav')

diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c
index 841007bc85..e5904fb4c5 100644
--- a/modules/cal-config-caldav/e-caldav-chooser.c
+++ b/modules/cal-config-caldav/e-caldav-chooser.c
@@ -28,12 +28,7 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-authenticator.h>
-#include <libedataserver/e-source-calendar.h>
-#include <libedataserver/e-source-webdav.h>
-#include <libedataserverui/e-cell-renderer-color.h>
-#include <libedataserverui/e-passwords.h>
+#include <libedataserverui/libedataserverui.h>
 
 #define E_CALDAV_CHOOSER_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/modules/cal-config-caldav/e-caldav-chooser.h b/modules/cal-config-caldav/e-caldav-chooser.h
index b436161fdb..3c48b42675 100644
--- a/modules/cal-config-caldav/e-caldav-chooser.h
+++ b/modules/cal-config-caldav/e-caldav-chooser.h
@@ -20,8 +20,7 @@
 #define E_CALDAV_CHOOSER_H
 
 #include <gtk/gtk.h>
-#include <libecal/e-cal-client.h>
-#include <libedataserver/e-source-registry.h>
+#include <libecal/libecal.h>
 
 /* Standard GObject macros */
 #define E_TYPE_CALDAV_CHOOSER \
diff --git a/modules/cal-config-caldav/evolution-cal-config-caldav.c b/modules/cal-config-caldav/evolution-cal-config-caldav.c
index 0d8d6dd6cf..932f55a059 100644
--- a/modules/cal-config-caldav/evolution-cal-config-caldav.c
+++ b/modules/cal-config-caldav/evolution-cal-config-caldav.c
@@ -19,10 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
-#include <libedataserver/e-source-authentication.h>
-#include <libedataserver/e-source-security.h>
-#include <libedataserver/e-source-webdav.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-interval-chooser.h>
 #include <misc/e-source-config-backend.h>
-- 
cgit v1.2.3