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-contacts/e-contacts-selector.c           | 2 --
 modules/cal-config-contacts/e-contacts-selector.h           | 2 +-
 modules/cal-config-contacts/e-source-contacts.h             | 2 +-
 modules/cal-config-contacts/evolution-cal-config-contacts.c | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/modules/cal-config-contacts/e-contacts-selector.c b/modules/cal-config-contacts/e-contacts-selector.c
index 80b10754aa..1386177346 100644
--- a/modules/cal-config-contacts/e-contacts-selector.c
+++ b/modules/cal-config-contacts/e-contacts-selector.c
@@ -18,8 +18,6 @@
 
 #include "e-contacts-selector.h"
 
-#include <libedataserver/e-source-address-book.h>
-
 #include "e-source-contacts.h"
 
 G_DEFINE_DYNAMIC_TYPE (
diff --git a/modules/cal-config-contacts/e-contacts-selector.h b/modules/cal-config-contacts/e-contacts-selector.h
index 0afb02113f..5ba1ea9dca 100644
--- a/modules/cal-config-contacts/e-contacts-selector.h
+++ b/modules/cal-config-contacts/e-contacts-selector.h
@@ -19,7 +19,7 @@
 #ifndef E_CONTACTS_SELECTOR_H
 #define E_CONTACTS_SELECTOR_H
 
-#include <libedataserverui/e-source-selector.h>
+#include <libedataserverui/libedataserverui.h>
 
 /* Standard GObject macros */
 #define E_TYPE_CONTACTS_SELECTOR \
diff --git a/modules/cal-config-contacts/e-source-contacts.h b/modules/cal-config-contacts/e-source-contacts.h
index 95d9b8363c..d18fd92d0e 100644
--- a/modules/cal-config-contacts/e-source-contacts.h
+++ b/modules/cal-config-contacts/e-source-contacts.h
@@ -19,7 +19,7 @@
 #ifndef E_SOURCE_CONTACTS_H
 #define E_SOURCE_CONTACTS_H
 
-#include <libedataserver/e-source-extension.h>
+#include <libedataserver/libedataserver.h>
 
 /* Standard GObject macros */
 #define E_TYPE_SOURCE_CONTACTS \
diff --git a/modules/cal-config-contacts/evolution-cal-config-contacts.c b/modules/cal-config-contacts/evolution-cal-config-contacts.c
index 6b0fa896ec..b310917170 100644
--- a/modules/cal-config-contacts/evolution-cal-config-contacts.c
+++ b/modules/cal-config-contacts/evolution-cal-config-contacts.c
@@ -19,7 +19,7 @@
 #include <config.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <misc/e-source-config-backend.h>
 #include <calendar/gui/e-cal-source-config.h>
-- 
cgit v1.2.3