GNOME.org
 

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

commit e131a0da7d0d5f1bef5e69b45b8a3c1e4ae1523e
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Apr 2 17:20:14 2010 -0400

    Only #include Camel's top-level header.

 po/Makefile.in.in                                  |    4 +-
 .../exchange-mapi-account-listener.c               |    2 +-
 .../exchange-mapi-account-settings.c               |    4 ---
 .../exchange-mapi-account-setup.c                  |    4 ---
 src/camel/camel-mapi-folder.c                      |   17 ++-----------
 src/camel/camel-mapi-folder.h                      |    6 +----
 src/camel/camel-mapi-notifications.c               |    2 -
 src/camel/camel-mapi-provider.c                    |    5 ----
 src/camel/camel-mapi-store-summary.c               |    5 +---
 src/camel/camel-mapi-store-summary.h               |    3 +-
 src/camel/camel-mapi-store.c                       |   12 ----------
 src/camel/camel-mapi-store.h                       |    5 +---
 src/camel/camel-mapi-summary.c                     |    4 ---
 src/camel/camel-mapi-summary.h                     |    4 +--
 src/camel/camel-mapi-transport.c                   |   24 --------------------
 src/camel/camel-mapi-transport.h                   |    2 +-
 src/camel/camel-mapi-utils.c                       |   20 ----------------
 17 files changed, 12 insertions(+), 111 deletions(-)
---
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index c7e8302..cc8a222 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -56,7 +56,7 @@ ALL_LINGUAS = @ALL_LINGUAS@
 
 PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
 
-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
 
 USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
 
@@ -129,7 +129,7 @@ install-data-yes: all
 	done
 
 # Empty stubs to satisfy archaic automake needs
-dvi info tags TAGS ID:
+dvi info ctags tags CTAGS TAGS ID:
 
 # Define this as empty until I found a useful application.
 install-exec installcheck:
diff --git a/src/account-setup-eplugin/exchange-mapi-account-listener.c b/src/account-setup-eplugin/exchange-mapi-account-listener.c
index 235b079..5a6fe57 100644
--- a/src/account-setup-eplugin/exchange-mapi-account-listener.c
+++ b/src/account-setup-eplugin/exchange-mapi-account-listener.c
@@ -29,13 +29,13 @@
 #include "exchange-mapi-account-setup.h"
 #include <string.h>
 #include <glib/gi18n.h>
+#include <camel/camel.h>
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-account.h>
 #include <libecal/e-cal.h>
 #include <libedataserver/e-account-list.h>
 #include <libedataserver/e-source.h>
 #include <libedataserver/e-source-list.h>
-#include <camel/camel-url.h>
 
 #include <libmapi/libmapi.h>
 
diff --git a/src/account-setup-eplugin/exchange-mapi-account-settings.c b/src/account-setup-eplugin/exchange-mapi-account-settings.c
index b65d42e..7d7bb09 100644
--- a/src/account-setup-eplugin/exchange-mapi-account-settings.c
+++ b/src/account-setup-eplugin/exchange-mapi-account-settings.c
@@ -28,10 +28,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include <camel/camel-provider.h>
-#include <camel/camel-url.h>
-#include <camel/camel-service.h>
-#include <camel/camel-folder.h>
 #include <libedataserver/e-xml-hash-utils.h>
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-account.h>
diff --git a/src/account-setup-eplugin/exchange-mapi-account-setup.c b/src/account-setup-eplugin/exchange-mapi-account-setup.c
index db8ea89..bec47d8 100644
--- a/src/account-setup-eplugin/exchange-mapi-account-setup.c
+++ b/src/account-setup-eplugin/exchange-mapi-account-setup.c
@@ -31,10 +31,6 @@
 #include <glib/gi18n.h>
 
 #include <gtk/gtk.h>
-#include <camel/camel-provider.h>
-#include <camel/camel-url.h>
-#include <camel/camel-service.h>
-#include <camel/camel-folder.h>
 #include <libedataserver/e-xml-hash-utils.h>
 #include <libedataserverui/e-passwords.h>
 #include <libedataserver/e-account.h>
diff --git a/src/camel/camel-mapi-folder.c b/src/camel/camel-mapi-folder.c
index ab6f1e9..c7963c1 100644
--- a/src/camel/camel-mapi-folder.c
+++ b/src/camel/camel-mapi-folder.c
@@ -31,27 +31,16 @@
 
 #include <glib.h>
 
-#include <camel/camel-folder-search.h>
-#include <camel/camel-mime-part.h>
-#include <camel/camel-mime-utils.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-object.h>
-#include <camel/camel-mime-message.h>
-#include <camel/camel-data-wrapper.h>
-#include <camel/camel-multipart.h>
-#include <camel/camel-private.h>
-#include <camel/camel-session.h>
-#include <camel/camel-stream-buffer.h>
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-debug.h>
-
 #include <libmapi/libmapi.h>
 #include <exchange-mapi-defs.h>
 #include <exchange-mapi-utils.h>
 #include <exchange-mapi-folder.h>
 #include <exchange-mapi-cal-utils.h>
 
+#include <camel/camel-private.h>
+
 #include "camel-mapi-store.h"
+#include "camel-mapi-store-summary.h"
 #include "camel-mapi-folder.h"
 #include "camel-mapi-private.h"
 #include "camel-mapi-summary.h"
diff --git a/src/camel/camel-mapi-folder.h b/src/camel/camel-mapi-folder.h
index ca4d0be..2e4e8da 100644
--- a/src/camel/camel-mapi-folder.h
+++ b/src/camel/camel-mapi-folder.h
@@ -25,11 +25,7 @@
 #define __MAPI_FOLDER_H__
 
 
-#include <camel/camel-folder.h>
-#include <camel/camel-offline-folder.h>
-#include <camel/camel-data-cache.h>
-#include <camel/camel-offline-folder.h>
-#include <camel/camel-offline-journal.h>
+#include <camel/camel.h>
 #include <libmapi/libmapi.h>
 #include <exchange-mapi-connection.h>
 
diff --git a/src/camel/camel-mapi-notifications.c b/src/camel/camel-mapi-notifications.c
index 58aac0d..adaa195 100644
--- a/src/camel/camel-mapi-notifications.c
+++ b/src/camel/camel-mapi-notifications.c
@@ -36,8 +36,6 @@
 #include <gio/gio.h>
 
 #include <camel/camel-private.h>
-#include <camel/camel-net-utils.h>
-#include <camel/camel-debug.h>
 
 #include "camel-mapi-store.h"
 #include "camel-mapi-folder.h"
diff --git a/src/camel/camel-mapi-provider.c b/src/camel/camel-mapi-provider.c
index e2c0d31..7e6083e 100644
--- a/src/camel/camel-mapi-provider.c
+++ b/src/camel/camel-mapi-provider.c
@@ -31,11 +31,6 @@
 
 #include <gmodule.h>
 
-#include <camel/camel-provider.h>
-#include <camel/camel-session.h>
-#include <camel/camel-url.h>
-#include <camel/camel-sasl.h>
-
 #include "camel-mapi-store.h"
 #include "camel-mapi-transport.h"
 
diff --git a/src/camel/camel-mapi-store-summary.c b/src/camel/camel-mapi-store-summary.c
index 8321da2..828e58c 100644
--- a/src/camel/camel-mapi-store-summary.c
+++ b/src/camel/camel-mapi-store-summary.c
@@ -32,12 +32,9 @@
 #include <unistd.h>
 #include <glib.h>
 
+#include <camel/camel-private.h>
 #include <libedataserver/e-memory.h>
 
-#include <camel/camel-file-utils.h>
-#include <camel/camel-utf8.h>
-
-#include "camel-private.h"
 #include "camel-mapi-store.h"
 #include "camel-mapi-store-summary.h"
 
diff --git a/src/camel/camel-mapi-store-summary.h b/src/camel/camel-mapi-store-summary.h
index 0ef1c45..ced65e1 100644
--- a/src/camel/camel-mapi-store-summary.h
+++ b/src/camel/camel-mapi-store-summary.h
@@ -24,8 +24,7 @@
 #ifndef _CAMEL_MAPI_STORE_SUMMARY_H
 #define _CAMEL_MAPI_STORE_SUMMARY_H
 
-#include <camel/camel-object.h>
-#include <camel/camel-store-summary.h>
+#include <camel/camel.h>
 
 #define CAMEL_MAPI_STORE_SUMMARY_VERSION (0)
 
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index 50efcfa..ef65d60 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -33,19 +33,7 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
-#include <camel/camel-sasl.h>
-#include <camel/camel-utf8.h>
-#include <camel/camel-tcp-stream-raw.h>
-
-#ifdef HAVE_SSL
-#include <camel/camel-tcp-stream-ssl.h>
-#endif
-
 #include <camel/camel-private.h>
-#include <camel/camel-session.h>
-#include <camel/camel-service.h>
-#include <camel/camel-store-summary.h>
-#include <camel/camel-net-utils.h>
 
 #include "camel-mapi-store.h"
 #include "camel-mapi-folder.h"
diff --git a/src/camel/camel-mapi-store.h b/src/camel/camel-mapi-store.h
index 2c96905..fff2f86 100644
--- a/src/camel/camel-mapi-store.h
+++ b/src/camel/camel-mapi-store.h
@@ -26,10 +26,7 @@
 
 #include <glib/gi18n.h>
 
-#include <camel/camel-store.h>
-#include <camel/camel-offline-store.h>
-#include <camel-mapi-store-summary.h>
-#include <camel/camel-net-utils.h>
+#include <camel/camel.h>
 
 #include <exchange-mapi-folder.h>
 
diff --git a/src/camel/camel-mapi-summary.c b/src/camel/camel-mapi-summary.c
index 1e8c938..50dedec 100644
--- a/src/camel/camel-mapi-summary.c
+++ b/src/camel/camel-mapi-summary.c
@@ -30,10 +30,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <camel/camel-db.h>
-#include <camel/camel-data-cache.h>
-#include <camel/camel-file-utils.h>
-#include <camel/camel-folder.h>
 
 #include "camel-mapi-folder.h"
 #include "camel-mapi-summary.h"
diff --git a/src/camel/camel-mapi-summary.h b/src/camel/camel-mapi-summary.h
index d5e6b6e..027a0e4 100644
--- a/src/camel/camel-mapi-summary.h
+++ b/src/camel/camel-mapi-summary.h
@@ -24,9 +24,7 @@
 #ifndef _CAMEL_MAPI_SUMMARY_H
 #define _CAMEL_MAPI_SUMMARY_H
 
-#include <camel/camel-folder-summary.h>
-#include <camel/camel-exception.h>
-#include <camel/camel-store.h>
+#include <camel/camel.h>
 
 #define CAMEL_MAPI_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_mapi_summary_get_type (), CamelMapiSummary)
 #define CAMEL_MAPI_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mapi_summary_get_type (), CamelMapiSummaryClass)
diff --git a/src/camel/camel-mapi-transport.c b/src/camel/camel-mapi-transport.c
index 9de4159..b053006 100644
--- a/src/camel/camel-mapi-transport.c
+++ b/src/camel/camel-mapi-transport.c
@@ -32,16 +32,6 @@
 #include <libmapi/libmapi.h>
 #include <gen_ndr/exchange.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-multipart.h>
-#include <camel/camel-session.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-mem.h>
-
-
 #include "camel-mapi-transport.h"
 
 #include <stdio.h>
@@ -49,26 +39,12 @@
 #include <ctype.h>
 #include <errno.h>
 
-#include <camel/camel-sasl.h>
-#include <camel/camel-utf8.h>
-#include <camel/camel-tcp-stream-raw.h>
-
-#ifdef HAVE_SSL
-#include <camel/camel-tcp-stream-ssl.h>
-#endif
-
-
-#include <camel/camel-private.h>
-#include <camel/camel-net-utils.h>
 #include "camel-mapi-store.h"
 #include "camel-mapi-folder.h"
 #include "camel-mapi-store-summary.h"
 #include "camel-mapi-utils.h"
-#include <camel/camel-session.h>
-#include <camel/camel-store-summary.h>
 #define d(x) x
 
-#include <camel/camel-seekable-stream.h>
 #include <exchange-mapi-defs.h>
 
 #define STREAM_SIZE 4000
diff --git a/src/camel/camel-mapi-transport.h b/src/camel/camel-mapi-transport.h
index a1d7986..c9210b7 100644
--- a/src/camel/camel-mapi-transport.h
+++ b/src/camel/camel-mapi-transport.h
@@ -24,8 +24,8 @@
 #ifndef CAMEL_MAPI_TRANSPORT_H
 #define CAMEL_MAPI_TRANSPORT_H 1
 
+#include <camel/camel.h>
 #include <libmapi/libmapi.h>
-#include <camel/camel-transport.h>
 #include <exchange-mapi-connection.h>
 
 #define CAMEL_MAPI_TRANSPORT_TYPE     (camel_mapi_transport_get_type ())
diff --git a/src/camel/camel-mapi-utils.c b/src/camel/camel-mapi-utils.c
index 7d45da0..4695289 100644
--- a/src/camel/camel-mapi-utils.c
+++ b/src/camel/camel-mapi-utils.c
@@ -33,26 +33,6 @@
 #include <libmapi/libmapi.h>
 #include <gen_ndr/exchange.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-multipart.h>
-#include <camel/camel-session.h>
-#include <camel/camel-stream-filter.h>
-#include <camel/camel-stream-mem.h>
-
-#include <camel/camel-private.h>
-#include <camel/camel-net-utils.h>
-#include <camel/camel-seekable-stream.h>
-#include <camel/camel-sasl.h>
-#include <camel/camel-utf8.h>
-#include <camel/camel-tcp-stream-raw.h>
-
-#ifdef HAVE_SSL
-#include <camel/camel-tcp-stream-ssl.h>
-#endif
-
 #include <exchange-mapi-defs.h>
 
 #include "camel-mapi-store.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]