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/mail/e-mail-config-format-html.c | 2 +-
 modules/mail/e-mail-config-reader.c      | 2 +-
 modules/mail/e-mail-config-web-view.c    | 2 +-
 modules/mail/e-mail-shell-backend.c      | 3 ---
 modules/mail/e-mail-shell-content.c      | 1 -
 modules/mail/e-mail-shell-view-private.h | 1 -
 modules/mail/em-mailer-prefs.c           | 2 --
 7 files changed, 3 insertions(+), 10 deletions(-)

(limited to 'modules/mail')

diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index dad5f9a518..527f720159 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -22,7 +22,7 @@
 
 #include "e-mail-config-format-html.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <e-util/e-util.h>
diff --git a/modules/mail/e-mail-config-reader.c b/modules/mail/e-mail-config-reader.c
index b284fbdd8d..3926d05a7d 100644
--- a/modules/mail/e-mail-config-reader.c
+++ b/modules/mail/e-mail-config-reader.c
@@ -22,7 +22,7 @@
 
 #include "e-mail-config-reader.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <mail/e-mail-reader.h>
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index 813256efd1..12e75dfbdf 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -25,7 +25,7 @@
 
 #include "e-mail-config-web-view.h"
 
-#include <libebackend/e-extension.h>
+#include <libebackend/libebackend.h>
 
 #include <shell/e-shell.h>
 #include <misc/e-web-view.h>
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 2f8e9c8b71..f5bb100c39 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -27,9 +27,6 @@
 
 #include <glib/gi18n.h>
 
-#include <libedataserver/e-source-registry.h>
-#include <libedataserver/e-source-mail-transport.h>
-
 #include <e-util/e-import.h>
 #include <e-util/e-util.h>
 
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 1bf6d4e29a..15d477a3c0 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -26,7 +26,6 @@
 #include "e-mail-shell-content.h"
 
 #include <glib/gi18n.h>
-#include <libedataserver/e-data-server-util.h>
 
 #include <e-util/e-util-private.h>
 
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index f9c3ba2080..4a7f342085 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -27,7 +27,6 @@
 #include <glib/gi18n.h>
 #include <gtkhtml/gtkhtml.h>
 #include <camel/camel-search-private.h>  /* for camel_search_word */
-#include <libedataserver/e-source-mail-account.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-ui-manager.h>
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index cf20b8f777..00334d7559 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -33,8 +33,6 @@
 #include <gtkhtml/gtkhtml-properties.h>
 #include <libxml/tree.h>
 
-#include "libedataserverui/e-cell-renderer-color.h"
-
 #include <e-util/e-util.h>
 #include <e-util/e-datetime-format.h>
 #include <e-util/e-util-private.h>
-- 
cgit v1.2.3