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.

---
 plugins/bbdb/bbdb.c        | 5 +----
 plugins/bbdb/bbdb.h        | 3 +--
 plugins/bbdb/gaimbuddies.c | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'plugins/bbdb')

diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 43f9814210..c78bdca1fd 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -28,10 +28,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <libebook/e-book-client.h>
-#include <libedataserver/e-source-address-book.h>
-#include <libedataserverui/e-source-combo-box.h>
-#include <libedataserverui/e-client-utils.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <e-util/e-config.h>
 #include <addressbook/gui/widgets/eab-config.h>
diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h
index 9104e0896b..8681592921 100644
--- a/plugins/bbdb/bbdb.h
+++ b/plugins/bbdb/bbdb.h
@@ -37,8 +37,7 @@
 #define GAIM_ADDRESSBOOK 1
 #define AUTOMATIC_CONTACTS_ADDRESSBOOK 0
 
-#include <libebook/e-book-client.h>
-#include <libebook/e-contact.h>
+#include <libebook/libebook.h>
 
 /* bbdb.c */
 /* creates an EBookClient for a given type (gaim or contacts), but doesn't open it;
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 2f304cbdd8..9d01ccd6cb 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -42,9 +42,7 @@
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <libebook/e-book-client.h>
-#include <libebook/e-book-query.h>
-#include <libedataserverui/e-source-combo-box.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <sys/time.h>
 #include <sys/stat.h>
-- 
cgit v1.2.3