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.

---
 composer/e-composer-header-table.c | 5 +----
 composer/e-composer-header-table.h | 2 +-
 composer/e-composer-header.h       | 2 +-
 composer/e-composer-name-header.h  | 4 ++--
 composer/e-composer-private.h      | 8 +-------
 composer/e-msg-composer.h          | 3 ++-
 6 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'composer')

diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 742ab11a9d..1290a6784f 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -22,10 +22,7 @@
 #include "e-composer-header-table.h"
 
 #include <glib/gi18n-lib.h>
-#include <libedataserverui/e-name-selector.h>
-#include <libedataserver/e-source-mail-account.h>
-#include <libedataserver/e-source-mail-composition.h>
-#include <libedataserver/e-source-mail-identity.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <shell/e-shell.h>
 #include <misc/e-mail-signature-combo-box.h>
diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h
index b76e9b6395..3e7e16c527 100644
--- a/composer/e-composer-header-table.h
+++ b/composer/e-composer-header-table.h
@@ -18,7 +18,7 @@
 #ifndef E_COMPOSER_HEADER_TABLE_H
 #define E_COMPOSER_HEADER_TABLE_H
 
-#include <libebook/e-destination.h>
+#include <libebook/libebook.h>
 
 #include <shell/e-shell.h>
 #include <composer/e-composer-header.h>
diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h
index 24bfb7d5bc..9bb665320d 100644
--- a/composer/e-composer-header.h
+++ b/composer/e-composer-header.h
@@ -19,7 +19,7 @@
 #define E_COMPOSER_HEADER_H
 
 #include <composer/e-composer-common.h>
-#include <libedataserver/e-source-registry.h>
+#include <libedataserver/libedataserver.h>
 
 /* Standard GObject macros */
 #define E_TYPE_COMPOSER_HEADER \
diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h
index cb4dc03abf..b745941a3e 100644
--- a/composer/e-composer-name-header.h
+++ b/composer/e-composer-name-header.h
@@ -18,8 +18,8 @@
 #ifndef E_COMPOSER_NAME_HEADER_H
 #define E_COMPOSER_NAME_HEADER_H
 
-#include <libebook/e-destination.h>
-#include <libedataserverui/e-name-selector.h>
+#include <libebook/libebook.h>
+#include <libedataserverui/libedataserverui.h>
 
 #include <composer/e-composer-header.h>
 
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 4c40872797..4370b1a12b 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -30,13 +30,7 @@
 #include <glib/gstdio.h>
 #include <glib/gi18n-lib.h>
 
-#include <libebackend/e-extensible.h>
-#include <libedataserver/e-source-mail-composition.h>
-#include <libedataserver/e-source-mail-identity.h>
-#include <libedataserver/e-source-mail-signature.h>
-#include <libedataserver/e-source-mail-submission.h>
-#include <libedataserver/e-source-openpgp.h>
-#include <libedataserver/e-source-smime.h>
+#include <libebackend/libebackend.h>
 
 #include "e-composer-actions.h"
 #include "e-composer-activity.h"
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index 318165d740..a85993fd87 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -25,8 +25,9 @@
 #define E_MSG_COMPOSER_H
 
 #include <camel/camel.h>
-#include <libebook/e-destination.h>
 #include <gtkhtml-editor.h>
+#include <libebook/libebook.h>
+
 #include <misc/e-attachment-view.h>
 #include <misc/e-focus-tracker.h>
 #include <misc/e-web-view-gtkhtml.h>
-- 
cgit v1.2.3