GNOME.org
 

[evolution-exchange] Only #include Camel's top-level header.

commit 21efb7dec25ea40f3410f79b17400a2727ec969d
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Apr 2 16:56:13 2010 -0400

    Only #include Camel's top-level header.

 addressbook/e-book-backend-exchange-factory.c |    2 +-
 addressbook/e-book-backend-exchange.c         |    5 +----
 calendar/e-cal-backend-exchange-factory.c     |    2 +-
 calendar/e-cal-backend-exchange.c             |    5 +----
 camel/camel-exchange-folder.c                 |   12 ------------
 camel/camel-exchange-folder.h                 |   10 +++-------
 camel/camel-exchange-journal.c                |    6 ------
 camel/camel-exchange-journal.h                |    7 ++-----
 camel/camel-exchange-provider.c               |    3 ---
 camel/camel-exchange-search.c                 |    3 ---
 camel/camel-exchange-search.h                 |    2 +-
 camel/camel-exchange-store.c                  |    2 --
 camel/camel-exchange-store.h                  |    7 +++----
 camel/camel-exchange-summary.c                |    5 -----
 camel/camel-exchange-summary.h                |    2 +-
 camel/camel-exchange-transport.c              |   11 +----------
 camel/camel-exchange-transport.h              |    6 +++---
 camel/camel-exchange-utils.c                  |    5 -----
 camel/camel-exchange-utils.h                  |    3 +--
 camel/mail-utils.c                            |    1 -
 camel/mail-utils.h                            |    2 +-
 eplugin/exchange-account-setup.c              |    4 ----
 eplugin/exchange-config-listener.c            |    2 +-
 eplugin/exchange-delegates-user.c             |    3 ---
 eplugin/exchange-folder-permission.c          |    1 -
 eplugin/exchange-folder.c                     |    2 --
 eplugin/exchange-mail-send-options.c          |    2 --
 tools/exchange-share-config-listener.c        |    3 +--
 28 files changed, 22 insertions(+), 96 deletions(-)
---
diff --git a/addressbook/e-book-backend-exchange-factory.c b/addressbook/e-book-backend-exchange-factory.c
index aa5afa7..8a22ad1 100644
--- a/addressbook/e-book-backend-exchange-factory.c
+++ b/addressbook/e-book-backend-exchange-factory.c
@@ -24,9 +24,9 @@
 #include <pthread.h>
 #include <string.h>
 
+#include <camel/camel.h>
 #include <libebackend/e-data-server-module.h>
 #include <libedata-book/e-book-backend-factory.h>
-#include <camel/camel-object.h>
 
 #include "e-book-backend-exchange.h"
 #include "e-book-backend-gal.h"
diff --git a/addressbook/e-book-backend-exchange.c b/addressbook/e-book-backend-exchange.c
index 0e23676..ee4e86c 100644
--- a/addressbook/e-book-backend-exchange.c
+++ b/addressbook/e-book-backend-exchange.c
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <time.h>
 
+#include <camel/camel.h>
 #include <libedataserver/e-sexp.h>
 #include <libedataserver/e-uid.h>
 #include <libebook/e-address-western.h>
@@ -42,10 +43,6 @@
 #include <libedata-book/e-book-backend-cache.h>
 #include <libedataserver/e-xml-hash-utils.h>
 
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
-
 #include <e2k-context.h>
 #include <e2k-propnames.h>
 #include <e2k-restriction.h>
diff --git a/calendar/e-cal-backend-exchange-factory.c b/calendar/e-cal-backend-exchange-factory.c
index 6545f41..c4c06be 100644
--- a/calendar/e-cal-backend-exchange-factory.c
+++ b/calendar/e-cal-backend-exchange-factory.c
@@ -24,8 +24,8 @@
 #include <pthread.h>
 #include <string.h>
 
+#include <camel/camel.h>
 #include <libebackend/e-data-server-module.h>
-#include <camel/camel-object.h>
 #include "e-cal-backend-exchange-factory.h"
 #include "e-cal-backend-exchange-calendar.h"
 #include "e-cal-backend-exchange-tasks.h"
diff --git a/calendar/e-cal-backend-exchange.c b/calendar/e-cal-backend-exchange.c
index f86783a..7649219 100644
--- a/calendar/e-cal-backend-exchange.c
+++ b/calendar/e-cal-backend-exchange.c
@@ -34,10 +34,7 @@
 #include <gio/gio.h>
 #include <glib/gstdio.h>
 
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-file-utils.h>
+#include <camel/camel.h>
 
 #include "e-cal-backend-exchange.h"
 #include "e2k-cal-utils.h"
diff --git a/camel/camel-exchange-folder.c b/camel/camel-exchange-folder.c
index c45243a..96fd178 100644
--- a/camel/camel-exchange-folder.c
+++ b/camel/camel-exchange-folder.c
@@ -30,18 +30,6 @@
 #include <glib/gi18n-lib.h>
 #include <libedataserver/e-data-server-util.h>
 
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-mime-filter-crlf.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-session.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-string-utils.h>
-
 #include "camel-exchange-folder.h"
 #include "camel-exchange-search.h"
 #include "camel-exchange-store.h"
diff --git a/camel/camel-exchange-folder.h b/camel/camel-exchange-folder.h
index 590355f..dcada07 100644
--- a/camel/camel-exchange-folder.h
+++ b/camel/camel-exchange-folder.h
@@ -6,19 +6,15 @@
 #ifndef CAMEL_EXCHANGE_FOLDER_H
 #define CAMEL_EXCHANGE_FOLDER_H 1
 
-G_BEGIN_DECLS
-
-#include <camel/camel-offline-folder.h>
-#include <camel/camel-folder.h>
-#include <camel/camel-data-cache.h>
-#include <camel/camel-offline-folder.h>
-#include <camel/camel-offline-journal.h>
+#include <camel/camel.h>
 
 #define CAMEL_EXCHANGE_FOLDER_TYPE     (camel_exchange_folder_get_type ())
 #define CAMEL_EXCHANGE_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_EXCHANGE_FOLDER_TYPE, CamelExchangeFolder))
 #define CAMEL_EXCHANGE_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_EXCHANGE_FOLDER_TYPE, CamelExchangeFolderClass))
 #define CAMEL_IS_EXCHANGE_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_EXCHANGE_FOLDER_TYPE))
 
+G_BEGIN_DECLS
+
 typedef struct {
 	CamelOfflineFolder parent_object;
 
diff --git a/camel/camel-exchange-journal.c b/camel/camel-exchange-journal.c
index af11fd0..d2937ea 100644
--- a/camel/camel-exchange-journal.c
+++ b/camel/camel-exchange-journal.c
@@ -33,12 +33,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <camel/camel-folder.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-data-cache.h>
-#include <camel/camel-string-utils.h>
-
 #include "camel-exchange-journal.h"
 #include "camel-exchange-store.h"
 #include "camel-exchange-summary.h"
diff --git a/camel/camel-exchange-journal.h b/camel/camel-exchange-journal.h
index def35f2..c61df02 100644
--- a/camel/camel-exchange-journal.h
+++ b/camel/camel-exchange-journal.h
@@ -25,13 +25,8 @@
 
 #include <glib.h>
 
-#include <camel/camel-list-utils.h>
-#include <camel/camel-offline-journal.h>
-#include <camel/camel-mime-message.h>
 #include "camel-exchange-folder.h"
 
-G_BEGIN_DECLS
-
 #define CAMEL_TYPE_EXCHANGE_JOURNAL            (camel_exchange_journal_get_type ())
 #define CAMEL_EXCHANGE_JOURNAL(obj)            (CAMEL_CHECK_CAST ((obj), CAMEL_TYPE_EXCHANGE_JOURNAL, CamelExchangeJournal))
 #define CAMEL_EXCHANGE_JOURNAL_CLASS(klass)    (CAMEL_CHECK_CLASS_CAST ((klass), CAMEL_TYPE_EXCHANGE_JOURNAL, CamelExchangeJournalClass))
@@ -39,6 +34,8 @@ G_BEGIN_DECLS
 #define CAMEL_IS_EXCHANGE_JOURNAL_CLASS(klass) (CAMEL_CHECK_CLASS_TYPE ((klass), CAMEL_TYPE_EXCHANGE_JOURNAL))
 #define CAMEL_EXCHANGE_JOURNAL_GET_CLASS(obj)  (CAMEL_CHECK_GET_CLASS ((obj), CAMEL_TYPE_EXCHANGE_JOURNAL, CamelExchangeJournalClass))
 
+G_BEGIN_DECLS
+
 typedef struct _CamelExchangeJournal CamelExchangeJournal;
 typedef struct _CamelExchangeJournalClass CamelExchangeJournalClass;
 typedef struct _CamelExchangeJournalEntry CamelExchangeJournalEntry;
diff --git a/camel/camel-exchange-provider.c b/camel/camel-exchange-provider.c
index f8cb314..f884384 100644
--- a/camel/camel-exchange-provider.c
+++ b/camel/camel-exchange-provider.c
@@ -29,9 +29,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <camel/camel-provider.h>
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
 #include "camel-exchange-store.h"
 #include "camel-exchange-transport.h"
 
diff --git a/camel/camel-exchange-search.c b/camel/camel-exchange-search.c
index a662cf7..5a3e490 100644
--- a/camel/camel-exchange-search.c
+++ b/camel/camel-exchange-search.c
@@ -25,9 +25,6 @@
 
 #include <string.h>
 
-#include <camel/camel-offline-store.h>
-#include <camel/camel-folder-summary.h>
-
 #include "camel-exchange-search.h"
 #include "camel-exchange-folder.h"
 #include "camel-exchange-utils.h"
diff --git a/camel/camel-exchange-search.h b/camel/camel-exchange-search.h
index f1bbd4c..e6d7ccb 100644
--- a/camel/camel-exchange-search.h
+++ b/camel/camel-exchange-search.h
@@ -6,7 +6,7 @@
 #ifndef _CAMEL_EXCHANGE_SEARCH_H
 #define _CAMEL_EXCHANGE_SEARCH_H
 
-#include <camel/camel-folder-search.h>
+#include <camel/camel.h>
 
 #define CAMEL_EXCHANGE_SEARCH_TYPE         (camel_exchange_search_get_type ())
 #define CAMEL_EXCHANGE_SEARCH(obj)         CAMEL_CHECK_CAST (obj, camel_exchange_search_get_type (), CamelExchangeSearch)
diff --git a/camel/camel-exchange-store.c b/camel/camel-exchange-store.c
index e1f0f14..cb81aa2 100644
--- a/camel/camel-exchange-store.c
+++ b/camel/camel-exchange-store.c
@@ -27,8 +27,6 @@
 
 #include <glib/gi18n-lib.h>
 
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
 #include <libedataserver/e-data-server-util.h>
 
 #include "camel-exchange-store.h"
diff --git a/camel/camel-exchange-store.h b/camel/camel-exchange-store.h
index d634fb0..ef18008 100644
--- a/camel/camel-exchange-store.h
+++ b/camel/camel-exchange-store.h
@@ -6,16 +6,15 @@
 #ifndef CAMEL_EXCHANGE_STORE_H
 #define CAMEL_EXCHANGE_STORE_H 1
 
-G_BEGIN_DECLS
-
-#include <camel/camel-store.h>
-#include <camel/camel-offline-store.h>
+#include <camel/camel.h>
 
 #define CAMEL_EXCHANGE_STORE_TYPE     (camel_exchange_store_get_type ())
 #define CAMEL_EXCHANGE_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_EXCHANGE_STORE_TYPE, CamelExchangeStore))
 #define CAMEL_EXCHANGE_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_EXCHANGE_STORE_TYPE, CamelExchangeStoreClass))
 #define CAMEL_IS_EXCHANGE_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_EXCHANGE_STORE_TYPE))
 
+G_BEGIN_DECLS
+
 typedef struct {
 	CamelOfflineStore parent_object;
 
diff --git a/camel/camel-exchange-summary.c b/camel/camel-exchange-summary.c
index 8d7a15f..3cafdba 100644
--- a/camel/camel-exchange-summary.c
+++ b/camel/camel-exchange-summary.c
@@ -27,11 +27,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <camel/camel-db.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-offline-store.h>
-#include <camel/camel-string-utils.h>
-
 #include "camel-exchange-folder.h"
 #include "camel-exchange-journal.h"
 #include "camel-exchange-summary.h"
diff --git a/camel/camel-exchange-summary.h b/camel/camel-exchange-summary.h
index 6ffdc69..df9205f 100644
--- a/camel/camel-exchange-summary.h
+++ b/camel/camel-exchange-summary.h
@@ -4,7 +4,7 @@
 #ifndef _CAMEL_EXCHANGE_SUMMARY_H
 #define _CAMEL_EXCHANGE_SUMMARY_H
 
-#include <camel/camel-folder-summary.h>
+#include <camel/camel.h>
 
 #define CAMEL_EXCHANGE_SUMMARY_TYPE         (camel_exchange_summary_get_type ())
 #define CAMEL_EXCHANGE_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_exchange_summary_get_type (), CamelExchangeSummary)
diff --git a/camel/camel-exchange-transport.c b/camel/camel-exchange-transport.c
index 2403b7e..8928bfc 100644
--- a/camel/camel-exchange-transport.c
+++ b/camel/camel-exchange-transport.c
@@ -23,21 +23,12 @@
 #include <config.h>
 #endif
 
+#include <string.h>
 #include <glib/gi18n-lib.h>
 
 #include "camel-exchange-transport.h"
 #include "camel-exchange-utils.h"
 
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-mime-filter-crlf.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-session.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-mem.h>
-
-#include <string.h>
-
 static gboolean exchange_send_to (CamelTransport *transport,
 				  CamelMimeMessage *message,
 				  CamelAddress *from,
diff --git a/camel/camel-exchange-transport.h b/camel/camel-exchange-transport.h
index 20cbe00..e70e525 100644
--- a/camel/camel-exchange-transport.h
+++ b/camel/camel-exchange-transport.h
@@ -6,15 +6,15 @@
 #ifndef CAMEL_EXCHANGE_TRANSPORT_H
 #define CAMEL_EXCHANGE_TRANSPORT_H 1
 
-G_BEGIN_DECLS
-
-#include <camel/camel-transport.h>
+#include <camel/camel.h>
 
 #define CAMEL_EXCHANGE_TRANSPORT_TYPE     (camel_exchange_transport_get_type ())
 #define CAMEL_EXCHANGE_TRANSPORT(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_EXCHANGE_TRANSPORT_TYPE, CamelExchangeTransport))
 #define CAMEL_EXCHANGE_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_EXCHANGE_TRANSPORT_TYPE, CamelExchangeTransportClass))
 #define CAMEL_IS_EXCHANGE_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_EXCHANGE_TRANSPORT_TYPE))
 
+G_BEGIN_DECLS
+
 typedef struct {
 	CamelTransport parent_object;
 
diff --git a/camel/camel-exchange-utils.c b/camel/camel-exchange-utils.c
index b5ca301..105970b 100644
--- a/camel/camel-exchange-utils.c
+++ b/camel/camel-exchange-utils.c
@@ -32,11 +32,6 @@
 #include <exchange-hierarchy.h>
 #include <mapi.h>
 
-#include <camel/camel-folder.h>
-#include <camel/camel-service.h>
-#include <camel/camel-session.h>
-#include <camel/camel-store.h>
-
 #include "camel-exchange-folder.h"
 #include "camel-exchange-store.h"
 #include "camel-exchange-summary.h"
diff --git a/camel/camel-exchange-utils.h b/camel/camel-exchange-utils.h
index be22166..848dcc4 100644
--- a/camel/camel-exchange-utils.h
+++ b/camel/camel-exchange-utils.h
@@ -4,8 +4,7 @@
 #ifndef CAMEL_EXCHANGE_UTILS_H
 #define CAMEL_EXCHANGE_UTILS_H
 
-#include <camel/camel-service.h>
-#include <camel/camel-exception.h>
+#include <camel/camel.h>
 
 G_BEGIN_DECLS
 
diff --git a/camel/mail-utils.c b/camel/mail-utils.c
index 2040382..c2cf971 100644
--- a/camel/mail-utils.c
+++ b/camel/mail-utils.c
@@ -30,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <camel/camel-folder-summary.h>
 #include <libedataserver/e-data-server-util.h>
 #include <e-util/e-html-utils.h>
 #include <e-util/e-util.h>
diff --git a/camel/mail-utils.h b/camel/mail-utils.h
index 588485f..b3d3e39 100644
--- a/camel/mail-utils.h
+++ b/camel/mail-utils.h
@@ -4,7 +4,7 @@
 #ifndef __MAIL_UTILS_H__
 #define __MAIL_UTILS_H__
 
-#include <camel/camel-folder-summary.h>
+#include <camel/camel.h>
 
 #include "e2k-properties.h"
 
diff --git a/eplugin/exchange-account-setup.c b/eplugin/exchange-account-setup.c
index 879d2e8..b0cde83 100644
--- a/eplugin/exchange-account-setup.c
+++ b/eplugin/exchange-account-setup.c
@@ -33,10 +33,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
-#include <camel/camel-provider.h>
-#include <camel/camel-url.h>
-#include <camel/camel-service.h>
-#include <camel/camel-folder.h>
 #include <e-util/e-dialog-utils.h>
 #include <e2k-validate.h>
 #include <exchange-oof.h>
diff --git a/eplugin/exchange-config-listener.c b/eplugin/exchange-config-listener.c
index ceb49b5..9ba83da 100644
--- a/eplugin/exchange-config-listener.c
+++ b/eplugin/exchange-config-listener.c
@@ -36,11 +36,11 @@
 #include <e-folder-exchange.h>
 #include <e2k-marshal.h>
 #include <e2k-uri.h>
-#include <camel/camel-url.h>
 
 #include <e-util/e-alert-dialog.h>
 #include <shell/e-shell.h>
 
+#include <camel/camel.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-source-list.h>
 #include <libedataserver/e-source-group.h>
diff --git a/eplugin/exchange-delegates-user.c b/eplugin/exchange-delegates-user.c
index 6896dc1..cdb128a 100644
--- a/eplugin/exchange-delegates-user.c
+++ b/eplugin/exchange-delegates-user.c
@@ -31,9 +31,6 @@
 #include <mail/mail-ops.h>
 #include <mail/mail-send-recv.h>
 #include <mail/e-mail-local.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-stream-mem.h>
 #include <exchange-account.h>
 #include <e2k-global-catalog.h>
 #include <e2k-marshal.h>
diff --git a/eplugin/exchange-folder-permission.c b/eplugin/exchange-folder-permission.c
index 61f11f9..fd820c9 100644
--- a/eplugin/exchange-folder-permission.c
+++ b/eplugin/exchange-folder-permission.c
@@ -31,7 +31,6 @@
 
 #include <libedataserverui/e-source-selector.h>
 #include <libebook/e-book.h>
-#include <camel/camel-url.h>
 
 #include <exchange-account.h>
 
diff --git a/eplugin/exchange-folder.c b/eplugin/exchange-folder.c
index 6668286..c1729cd 100644
--- a/eplugin/exchange-folder.c
+++ b/eplugin/exchange-folder.c
@@ -31,8 +31,6 @@
 #include <exchange-hierarchy.h>
 #include <libedataserverui/e-source-selector.h>
 #include <e-util/e-alert-dialog.h>
-#include <camel/camel-store.h>
-#include <camel/camel-folder.h>
 #include <mail/mail-mt.h>
 #include <mail/mail-ops.h>
 #include <shell/e-shell.h>
diff --git a/eplugin/exchange-mail-send-options.c b/eplugin/exchange-mail-send-options.c
index 8c8d1c3..97263a1 100644
--- a/eplugin/exchange-mail-send-options.c
+++ b/eplugin/exchange-mail-send-options.c
@@ -26,8 +26,6 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
-#include <camel/camel-mime-message.h>
-#include <camel/camel-address.h>
 #include "mail/em-event.h"
 
 #include "composer/e-msg-composer.h"
diff --git a/tools/exchange-share-config-listener.c b/tools/exchange-share-config-listener.c
index 8d8bc66..8856ffb 100644
--- a/tools/exchange-share-config-listener.c
+++ b/tools/exchange-share-config-listener.c
@@ -33,14 +33,13 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
+#include <camel/camel.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-source-list.h>
 #include <libedataserver/e-source-group.h>
 #include <libedataserver/e-xml-utils.h>
 #include <libedataserver/e-xml-hash-utils.h>
 
-#include <camel/camel-url.h>
-
 #include <e2k-marshal.h>
 #include <e2k-uri.h>
 #include <exchange-account.h>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]