diff options
136 files changed, 63 insertions, 500 deletions
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index 0a159da304..080d1787c7 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -43,7 +43,7 @@ #include "eab-contact-merging.h" /* we link to camel for decoding quoted printable email addresses */ -#include <camel/camel-mime-utils.h> +#include <camel/camel.h> #include "addressbook/util/addressbook.h" diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 167c1b082d..d650a61954 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -75,7 +75,8 @@ libevolution_calendar_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(GNOME_PLATFORM_CFLAGS) \ $(LIBSOUP_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + $(EVOLUTION_CALENDAR_CFLAGS) \ + $(CAMEL_CFLAGS) ui_DATA = \ e-itip-control.ui \ diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c index 71fee19537..086707eae8 100644 --- a/calendar/gui/alarm-notify/notify-main.c +++ b/calendar/gui/alarm-notify/notify-main.c @@ -31,7 +31,7 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <unique/unique.h> -#include <camel/camel-object.h> +#include <camel/camel.h> #include <libedataserver/e-source.h> #include <libedataserverui/e-passwords.h> diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 6e9cb26c05..0bd89de799 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -15,7 +15,8 @@ libcal_dialogs_la_CPPFLAGS = \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DPREFIX=\""$(prefix)"\" \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + $(EVOLUTION_CALENDAR_CFLAGS) \ + $(CAMEL_CFLAGS) ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c index 5fe874d476..16f981785f 100644 --- a/calendar/gui/dialogs/comp-editor.c +++ b/calendar/gui/dialogs/comp-editor.c @@ -41,16 +41,6 @@ #include <e-util/gconf-bridge.h> #include <shell/e-shell.h> -#include <camel/camel-url.h> -#include <camel/camel-exception.h> -#include <camel/camel-folder.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-file-utils.h> -#include <camel/camel-stream-fs.h> - -#include "mail/mail-tools.h" - #include "../print.h" #include "../comp-util.h" #include "save-comp.h" diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c index dbc0fc884f..9caebe9e1c 100644 --- a/calendar/gui/e-cal-component-preview.c +++ b/calendar/gui/e-cal-component-preview.c @@ -33,7 +33,6 @@ #include <e-util/e-util.h> #include <e-util/e-categories-config.h> #include "calendar-config.h" -#include <camel/camel-mime-filter-tohtml.h> #define E_CAL_COMPONENT_PREVIEW_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c index 9fe0f1bdb6..f686ac5e73 100644 --- a/calendar/gui/itip-utils.c +++ b/calendar/gui/itip-utils.c @@ -38,7 +38,6 @@ #include "dialogs/comp-editor-util.h" #include <composer/e-msg-composer.h> -#include <camel/camel-mime-filter-tohtml.h> static const gchar *itip_methods[] = { "PUBLISH", diff --git a/capplet/settings/mail-account-view.h b/capplet/settings/mail-account-view.h index 618dce5361..df0a7a1114 100644 --- a/capplet/settings/mail-account-view.h +++ b/capplet/settings/mail-account-view.h @@ -26,7 +26,6 @@ #include <gtk/gtk.h> #include "mail/em-account-editor.h" #include <libedataserver/e-account-list.h> -#include <camel/camel-provider.h> #include "mail-view.h" #define MAIL_ACCOUNT_VIEW_TYPE (mail_account_view_get_type ()) diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c index eefb47e6d1..ca7492faeb 100644 --- a/composer/e-composer-autosave.c +++ b/composer/e-composer-autosave.c @@ -24,8 +24,6 @@ #include <e-util/e-alert-dialog.h> #include <e-util/e-util.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-stream-mem.h> #define AUTOSAVE_PREFIX ".evolution-composer.autosave" #define AUTOSAVE_SEED AUTOSAVE_PREFIX "-XXXXXX" diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c index f62dc376fd..92e2c72515 100644 --- a/composer/e-composer-header-table.c +++ b/composer/e-composer-header-table.c @@ -19,7 +19,6 @@ #include <string.h> #include <glib/gi18n-lib.h> -#include <camel/camel-internet-address.h> #include <libedataserverui/e-name-selector.h> #include "e-util/e-binding.h" diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c index cb297fe375..7fd26aa8a7 100644 --- a/composer/e-composer-post-header.c +++ b/composer/e-composer-post-header.c @@ -22,7 +22,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <camel/camel-url.h> +#include <camel/camel.h> #define E_COMPOSER_POST_HEADER_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h index cac41aabe4..570439530a 100644 --- a/composer/e-composer-private.h +++ b/composer/e-composer-private.h @@ -27,25 +27,6 @@ #include <glib/gi18n-lib.h> #include <glib/gstdio.h> -#include <camel/camel-charset-map.h> -#include <camel/camel-cipher-context.h> -#include <camel/camel-folder.h> -#include <camel/camel-gpg-context.h> -#include <camel/camel-iconv.h> -#include <camel/camel-mime-filter-basic.h> -#include <camel/camel-mime-filter-canon.h> -#include <camel/camel-mime-filter-charset.h> -#include <camel/camel-mime-filter-tohtml.h> -#include <camel/camel-multipart-encrypted.h> -#include <camel/camel-multipart-signed.h> -#include <camel/camel-stream-filter.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-string-utils.h> -#if defined (HAVE_NSS) -#include <camel/camel-smime-context.h> -#endif - #include "e-composer-actions.h" #include "e-composer-autosave.h" #include "e-composer-header-table.h" diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h index c55237ce52..e2ef459eee 100644 --- a/composer/e-msg-composer.h +++ b/composer/e-msg-composer.h @@ -24,9 +24,7 @@ #ifndef E_MSG_COMPOSER_H #define E_MSG_COMPOSER_H -#include <camel/camel-internet-address.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-session.h> +#include <camel/camel.h> #include <libedataserver/e-account.h> #include <libebook/e-destination.h> #include <gtkhtml-editor.h> diff --git a/e-util/e-signature-utils.c b/e-util/e-signature-utils.c index b28c0cb985..e01f9096fc 100644 --- a/e-util/e-signature-utils.c +++ b/e-util/e-signature-utils.c @@ -20,14 +20,9 @@ #include "e-signature-utils.h" #include <errno.h> +#include <camel/camel.h> #include <glib/gstdio.h> #include <gconf/gconf-client.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-stream-filter.h> -#include <camel/camel-mime-filter-charset.h> -#include <camel/camel-mime-filter-tohtml.h> #ifndef G_OS_WIN32 #include <sys/wait.h> diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c index aa1281fc3b..7a8fe696a8 100644 --- a/e-util/e-unicode.c +++ b/e-util/e-unicode.c @@ -34,7 +34,7 @@ #include <gtk/gtk.h> #include <libxml/xmlmemory.h> -#include <camel/camel-iconv.h> +#include <camel/camel.h> #include <glib/gi18n.h> #include "e-unicode.h" diff --git a/e-util/e-util.c b/e-util/e-util.c index 5dd70659e9..7b17f110f5 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -44,8 +44,6 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <camel/camel-url.h> - #ifdef G_OS_WIN32 #include <windows.h> #endif diff --git a/e-util/e-util.h b/e-util/e-util.h index 7d58a8a9d8..c3459195a3 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -26,9 +26,8 @@ #include <sys/types.h> #include <gtk/gtk.h> #include <limits.h> +#include <camel/camel.h> #include <gconf/gconf-client.h> -#include <camel/camel-object.h> -#include <cairo.h> #include <e-util/e-marshal.h> diff --git a/em-format/em-format-quote.c b/em-format/em-format-quote.c index bf906530f0..c297b48efa 100644 --- a/em-format/em-format-quote.c +++ b/em-format/em-format-quote.c @@ -27,14 +27,6 @@ #include <string.h> -#include <camel/camel-iconv.h> -#include <camel/camel-stream-filter.h> -#include <camel/camel-mime-filter-tohtml.h> -#include <camel/camel-mime-filter-enriched.h> -#include <camel/camel-string-utils.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-url.h> - #include <glib/gi18n.h> #include <gconf/gconf-client.h> @@ -478,11 +470,6 @@ emfq_format_attachment(EMFormat *emf, CamelStream *stream, CamelMimePart *part, } } -#include <camel/camel-medium.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-multipart.h> -#include <camel/camel-url.h> - static void emfq_text_plain(EMFormatQuote *emfq, CamelStream *stream, CamelMimePart *part, EMFormatHandler *info) { diff --git a/em-format/em-format-quote.h b/em-format/em-format-quote.h index afc3675461..100e59d0a8 100644 --- a/em-format/em-format-quote.h +++ b/em-format/em-format-quote.h @@ -23,7 +23,6 @@ #ifndef EM_FORMAT_QUOTE_H #define EM_FORMAT_QUOTE_H -#include <camel/camel-stream.h> #include "em-format.h" /* Standard GObject macros */ diff --git a/em-format/em-format.c b/em-format/em-format.c index f9126cabd2..4c1330bc51 100644 --- a/em-format/em-format.c +++ b/em-format/em-format.c @@ -31,23 +31,6 @@ #include <glib/gi18n.h> #include <gio/gio.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-multipart.h> -#include <camel/camel-multipart-encrypted.h> -#include <camel/camel-multipart-signed.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-gpg-context.h> -#include <camel/camel-smime-context.h> -#include <camel/camel-string-utils.h> -#include <camel/camel-stream-filter.h> -#include <camel/camel-stream-null.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-mime-filter-charset.h> -#include <camel/camel-mime-filter-windows.h> -#include <camel/camel-mime-filter-pgp.h> - #include "em-format.h" #include "e-util/e-util.h" #include "shell/e-shell.h" diff --git a/em-format/em-format.h b/em-format/em-format.h index 39f6240b76..965ca20399 100644 --- a/em-format/em-format.h +++ b/em-format/em-format.h @@ -29,13 +29,7 @@ #define EM_FORMAT_H #include <glib-object.h> -#include <camel/camel-url.h> -#include <camel/camel-folder.h> -#include <camel/camel-stream.h> -#include <camel/camel-session.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-cipher-context.h> +#include <camel/camel.h> /* Standard GObject macros */ #define EM_TYPE_FORMAT \ diff --git a/em-format/em-stripsig-filter.h b/em-format/em-stripsig-filter.h index 39493e5e88..25ea2395e3 100644 --- a/em-format/em-stripsig-filter.h +++ b/em-format/em-stripsig-filter.h @@ -23,7 +23,7 @@ #ifndef __EM_STRIPSIG_FILTER_H__ #define __EM_STRIPSIG_FILTER_H__ -#include <camel/camel-mime-filter.h> +#include <camel/camel.h> G_BEGIN_DECLS diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 4ab444027f..17b8b4b9a0 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -24,8 +24,6 @@ #include "e-mail-backend.h" -#include <camel/camel.h> - #include "e-util/e-account-utils.h" #include "e-util/e-alert-dialog.h" diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c index 9e63645bfa..67adeec352 100644 --- a/mail/e-mail-browser.c +++ b/mail/e-mail-browser.c @@ -23,7 +23,6 @@ #include <string.h> #include <glib/gi18n.h> -#include <camel/camel-folder.h> #include "e-util/e-util.h" #include "e-util/e-plugin-ui.h" diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c index ed0d4cdd6b..bad13c99fd 100644 --- a/mail/e-mail-label-list-store.c +++ b/mail/e-mail-label-list-store.c @@ -22,7 +22,7 @@ #include "e-mail-label-list-store.h" #include <glib/gi18n.h> -#include <camel/camel-utf8.h> +#include <camel/camel.h> #include "e-util/gconf-bridge.h" #define E_MAIL_LABEL_LIST_STORE_GET_PRIVATE(obj) \ diff --git a/mail/e-mail-local.h b/mail/e-mail-local.h index b8dda29857..b5b7e8ab8c 100644 --- a/mail/e-mail-local.h +++ b/mail/e-mail-local.h @@ -23,8 +23,7 @@ #define E_MAIL_LOCAL_H #include <glib.h> -#include <camel/camel-folder.h> -#include <camel/camel-store.h> +#include <camel/camel.h> G_BEGIN_DECLS diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c index 3659c73466..968aaa653f 100644 --- a/mail/e-mail-migrate.c +++ b/mail/e-mail-migrate.c @@ -41,12 +41,6 @@ #include <gconf/gconf-client.h> -#include <camel/camel.h> -#include <camel/camel-store.h> -#include <camel/camel-session.h> -#include <camel/camel-file-utils.h> -#include <camel/camel-disco-folder.h> - #include <libxml/tree.h> #include <libxml/parser.h> #include <libxml/xmlmemory.h> diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index b525345d4a..f41c4e2d68 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -25,9 +25,7 @@ #include <glib/gi18n.h> #include <gtkhtml/gtkhtml.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-vee-folder.h> -#include <camel/camel-vee-store.h> +#include <camel/camel.h> #include "e-util/e-alert-dialog.h" #include "filter/e-filter-rule.h" diff --git a/mail/e-mail-reader.h b/mail/e-mail-reader.h index a79d7f5274..8a13223df9 100644 --- a/mail/e-mail-reader.h +++ b/mail/e-mail-reader.h @@ -28,7 +28,7 @@ * a GtkWidget pointer which almost always has to be type casted. */ #include <gtk/gtk.h> -#include <camel/camel-folder.h> +#include <camel/camel.h> #include <mail/em-format-html-display.h> #include <shell/e-shell-backend.h> diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c index f088b9f805..1024ec6b68 100644 --- a/mail/e-mail-store.c +++ b/mail/e-mail-store.c @@ -22,9 +22,7 @@ #include "e-mail-store.h" #include <glib/gi18n.h> -#include <camel/camel-service.h> -#include <camel/camel-session.h> -#include <camel/camel-url.h> +#include <camel/camel.h> #include <libedataserver/e-account.h> #include <libedataserver/e-account-list.h> diff --git a/mail/e-mail-store.h b/mail/e-mail-store.h index bfd1ab47c8..7d42fc3647 100644 --- a/mail/e-mail-store.h +++ b/mail/e-mail-store.h @@ -23,7 +23,7 @@ #define E_MAIL_STORE_H #include <glib.h> -#include <camel/camel-store.h> +#include <camel/camel.h> G_BEGIN_DECLS diff --git a/mail/e-mail-tag-editor.h b/mail/e-mail-tag-editor.h index b28674cff6..fe2365c903 100644 --- a/mail/e-mail-tag-editor.h +++ b/mail/e-mail-tag-editor.h @@ -25,8 +25,7 @@ #define E_MAIL_TAG_EDITOR_H #include <gtk/gtk.h> -#include <camel/camel-folder.h> -#include <camel/camel-folder-summary.h> +#include <camel/camel.h> /* Standard GObject macros */ #define E_TYPE_MAIL_TAG_EDITOR \ diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index fc312c8ae4..ec6ab34088 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -59,13 +59,6 @@ #include "em-format-quote.h" #include "em-event.h" -#include <camel/camel-folder.h> -#include <camel/camel-multipart.h> -#include <camel/camel-string-utils.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-nntp-address.h> -#include <camel/camel-vee-folder.h> - #ifdef G_OS_WIN32 /* Undef the similar macro from pthread.h, it doesn't check if * gmtime() returns NULL. diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h index be29a7ae71..a3c6f1185c 100644 --- a/mail/em-composer-utils.h +++ b/mail/em-composer-utils.h @@ -24,9 +24,6 @@ #ifndef __EM_COMPOSER_UTILS_H__ #define __EM_COMPOSER_UTILS_H__ -#include <glib.h> -#include <camel/camel-nntp-address.h> - #include <em-format/em-format.h> #include <composer/e-msg-composer.h> diff --git a/mail/em-config.c b/mail/em-config.c index 4b1e835627..67cfddf4f9 100644 --- a/mail/em-config.c +++ b/mail/em-config.c @@ -33,17 +33,6 @@ #include "em-utils.h" #include "em-composer-utils.h" -#include <camel/camel-store.h> -#include <camel/camel-folder.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-string-utils.h> -#include <camel/camel-mime-utils.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-url.h> - -#include <camel/camel-vee-folder.h> -#include <camel/camel-vtrash-folder.h> - #include <gconf/gconf.h> #include <gconf/gconf-client.h> diff --git a/mail/em-config.h b/mail/em-config.h index 62e74bea51..003498d2f6 100644 --- a/mail/em-config.h +++ b/mail/em-config.h @@ -23,9 +23,8 @@ #ifndef __EM_CONFIG_H__ #define __EM_CONFIG_H__ -#include <glib-object.h> +#include <camel/camel.h> #include <gconf/gconf-client.h> -#include <camel/camel-folder.h> #include <libedataserver/e-account.h> #include "e-util/e-config.h" diff --git a/mail/em-event.c b/mail/em-event.c index 7cb4c19a1e..6a77debd7e 100644 --- a/mail/em-event.c +++ b/mail/em-event.c @@ -32,17 +32,6 @@ #include "em-event.h" #include "composer/e-msg-composer.h" -#include <camel/camel-store.h> -#include <camel/camel-folder.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-string-utils.h> -#include <camel/camel-mime-utils.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-url.h> - -#include <camel/camel-vee-folder.h> -#include <camel/camel-vtrash-folder.h> - static GObjectClass *eme_parent; static EMEvent *em_event; diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index d080076725..bf185ce60f 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -30,9 +30,9 @@ #include "em-filter-source-element.h" #include <gtk/gtk.h> +#include <camel/camel.h> #include <libedataserver/e-sexp.h> #include <libedataserver/e-account-list.h> -#include <camel/camel-url.h> #include "filter/e-filter-part.h" @@ -44,7 +44,7 @@ static gint source_eq(EFilterElement *fe, EFilterElement *cm); static void xml_create(EFilterElement *fe, xmlNodePtr node); static xmlNodePtr xml_encode(EFilterElement *fe); static gint xml_decode(EFilterElement *fe, xmlNodePtr node); -static EFilterElement *clone(EFilterElement *fe); +static EFilterElement *filter_clone(EFilterElement *fe); static GtkWidget *get_widget(EFilterElement *fe); static void build_code(EFilterElement *fe, GString *out, EFilterPart *ff); static void format_sexp(EFilterElement *, GString *); @@ -106,7 +106,7 @@ em_filter_source_element_class_init(EMFilterSourceElementClass *klass) fe_class->xml_create = xml_create; fe_class->xml_encode = xml_encode; fe_class->xml_decode = xml_decode; - fe_class->clone = clone; + fe_class->clone = filter_clone; fe_class->get_widget = get_widget; fe_class->build_code = build_code; fe_class->format_sexp = format_sexp; @@ -212,7 +212,7 @@ xml_decode(EFilterElement *fe, xmlNodePtr node) } static EFilterElement * -clone(EFilterElement *fe) +filter_clone(EFilterElement *fe) { EMFilterSourceElement *fs = (EMFilterSourceElement *)fe; EMFilterSourceElement *cpy = em_filter_source_element_new(); diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 7b7957149c..e02f039ee2 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -27,15 +27,10 @@ #include <string.h> #include <gtk/gtk.h> +#include <glib/gi18n.h> #include <gconf/gconf-client.h> -#include <camel/camel-store.h> -#include <camel/camel-folder.h> -#include <camel/camel-vtrash-folder.h> -#include <camel/camel-vee-folder.h> -#include <glib/gi18n.h> - #include "em-folder-properties.h" #include "em-config.h" diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h index 330be151a3..d0809357e8 100644 --- a/mail/em-folder-properties.h +++ b/mail/em-folder-properties.h @@ -24,7 +24,7 @@ #ifndef __EM_FOLDER_PROPERTIES_H__ #define __EM_FOLDER_PROPERTIES_H__ -#include <camel/camel-folder.h> +#include <camel/camel.h> #include <shell/e-shell-view.h> G_BEGIN_DECLS diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 1a9123a34a..8ba323c135 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -25,10 +25,6 @@ #include <glib/gi18n.h> #include <e-util/e-util.h> -#include <camel/camel-url.h> -#include <camel/camel-store.h> -#include <camel/camel-session.h> - #include "em-folder-tree.h" #include "em-folder-selector.h" #include "em-folder-utils.h" diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 3daacc52c5..e34f9110e1 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -35,8 +35,6 @@ #include <glib/gi18n.h> -#include <camel/camel-file-utils.h> - #include "mail-config.h" #include "mail-session.h" #include "mail-tools.h" @@ -49,9 +47,6 @@ #include "em-folder-utils.h" #include "em-event.h" -#include <camel/camel-folder.h> -#include <camel/camel-vee-store.h> - #include "e-mail-local.h" #include "shell/e-shell.h" diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index e0a73e03b8..82775ae6bf 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -24,7 +24,7 @@ #define EM_FOLDER_TREE_MODEL_H #include <gtk/gtk.h> -#include <camel/camel-store.h> +#include <camel/camel.h> #include <libedataserver/e-account-list.h> /* Standard GObject macros */ diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index bbb9ec379b..badb6f8117 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -39,15 +39,6 @@ #include <gdk/gdkkeysyms.h> #include <glib/gi18n.h> -#include <camel/camel-session.h> -#include <camel/camel-store.h> -#include <camel/camel-folder.h> -#include <camel/camel-vee-store.h> -#include <camel/camel-vtrash-folder.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-file-utils.h> -#include <camel/camel-stream-fs.h> - #include "e-util/e-account-utils.h" #include "e-util/e-mktemp.h" #include "e-util/e-icon-factory.h" diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index 273a87aedf..5bdee73905 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -25,7 +25,7 @@ #define EM_FOLDER_TREE_H #include <gtk/gtk.h> -#include <camel/camel-store.h> +#include <camel/camel.h> #include <mail/em-folder-tree-model.h> /* Standard GObject macros */ diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index 98168866ae..3381275858 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -39,13 +39,6 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <glib/gi18n.h> -#include <camel/camel-session.h> -#include <camel/camel-vee-store.h> -#include <camel/camel-vtrash-folder.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-file-utils.h> -#include <camel/camel-stream-fs.h> - #include "e-util/e-mktemp.h" #include "e-util/e-alert-dialog.h" diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h index ec150f3066..ec5882d1aa 100644 --- a/mail/em-folder-utils.h +++ b/mail/em-folder-utils.h @@ -25,8 +25,7 @@ #define EM_FOLDER_UTILS_H #include <gtk/gtk.h> -#include <camel/camel-folder.h> -#include <camel/camel-store.h> +#include <camel/camel.h> #include <mail/em-folder-tree.h> G_BEGIN_DECLS diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index ee3e4ac3e9..e93b51744a 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -43,19 +43,6 @@ #include <glib/gi18n.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-filter.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-mime-filter-tohtml.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-multipart.h> -#include <camel/camel-internet-address.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-cipher-context.h> -#include <camel/camel-folder.h> -#include <camel/camel-string-utils.h> -#include <camel/camel-operation.h> - #include <e-util/e-util.h> #include <e-util/e-util-private.h> diff --git a/mail/em-format-html.c b/mail/em-format-html.c index a8ffc2fca1..3e9a26afca 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -54,25 +54,6 @@ #include <glib/gi18n.h> -#include <camel/camel-iconv.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-filter.h> -#include <camel/camel-mime-filter.h> -#include <camel/camel-mime-filter-tohtml.h> -#include <camel/camel-mime-filter-enriched.h> -#include <camel/camel-mime-filter-basic.h> -#include <camel/camel-gpg-context.h> -#include <camel/camel-cipher-context.h> -#include <camel/camel-multipart.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-url.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-string-utils.h> -#include <camel/camel-http-stream.h> -#include <camel/camel-data-cache.h> -#include <camel/camel-file-utils.h> - #include "mail-config.h" #include "mail-mt.h" @@ -1538,7 +1519,6 @@ efh_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTML *efh) /* ********************************************************************** */ #include "em-inline-filter.h" -#include <camel/camel-stream-null.h> /* FIXME: This is duplicated in em-format-html-display, should be exported or in security module */ static const struct { diff --git a/mail/em-format-html.h b/mail/em-format-html.h index bac45d8ecc..26a6671cea 100644 --- a/mail/em-format-html.h +++ b/mail/em-format-html.h @@ -30,10 +30,6 @@ #include <em-format/em-format.h> #include <mail/mail-config.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-stream.h> -#include <camel/camel-url.h> #include <gtkhtml/gtkhtml.h> #include <gtkhtml/gtkhtml-embedded.h> diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c index 1959b0b7f8..44187551f1 100644 --- a/mail/em-inline-filter.c +++ b/mail/em-inline-filter.c @@ -27,9 +27,6 @@ #include <string.h> #include "em-inline-filter.h" -#include <camel/camel-mime-part.h> -#include <camel/camel-multipart.h> -#include <camel/camel-stream-mem.h> #include "em-utils.h" #include "em-format/em-format.h" diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h index ac1779f8f0..11aaa7f5b8 100644 --- a/mail/em-inline-filter.h +++ b/mail/em-inline-filter.h @@ -24,9 +24,7 @@ #ifndef EM_INLINE_FILTER_H #define EM_INLINE_FILTER_H -#include <camel/camel-mime-filter.h> -#include <camel/camel-mime-utils.h> -#include <camel/camel-multipart.h> +#include <camel/camel.h> #define EM_INLINE_FILTER_TYPE (em_inline_filter_get_type ()) #define EM_INLINE_FILTER(obj) (CAMEL_CHECK_CAST((obj), EM_INLINE_FILTER_TYPE, EMInlineFilter)) diff --git a/mail/em-junk.h b/mail/em-junk.h index 79493caf2f..978f5ece7d 100644 --- a/mail/em-junk.h +++ b/mail/em-junk.h @@ -25,9 +25,8 @@ #ifndef EM_JUNK_H #define EM_JUNK_H +#include <camel/camel.h> #include <e-util/e-plugin.h> -#include <camel/camel-junk-plugin.h> -#include <camel/camel-mime-message.h> #define EM_JUNK_ERROR (em_junk_error_quark ()) diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 4211fdac05..6485af4e2f 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -30,9 +30,6 @@ #include "mail-ops.h" #include "mail-mt.h" /*#include "mail-folder-cache.h"*/ -#include "camel/camel-exception.h" -#include "camel/camel-store.h" -#include "camel/camel-session.h" #include "e-util/e-util.h" #include "e-util/e-account-utils.h" diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c index 982a56c90a..780ae9d7fd 100644 --- a/mail/em-sync-stream.c +++ b/mail/em-sync-stream.c @@ -29,7 +29,6 @@ #include <stdio.h> #include <string.h> -#include <camel/camel-object.h> #include <libedataserver/e-flag.h> #include "mail-mt.h" diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h index 3d74a02a35..b8684ac109 100644 --- a/mail/em-sync-stream.h +++ b/mail/em-sync-stream.h @@ -31,7 +31,7 @@ requests are always handled in the main gui thread in the correct order. #define EM_SYNC_STREAM_H #include <glib.h> -#include <camel/camel-stream.h> +#include <camel/camel.h> #define EM_SYNC_STREAM_TYPE \ (em_sync_stream_get_type ()) diff --git a/mail/em-utils.c b/mail/em-utils.c index a26b61099a..8c83382251 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -42,11 +42,6 @@ #undef interface #endif -#include <camel/camel-stream-fs.h> -#include <camel/camel-url-scanner.h> -#include <camel/camel-file-utils.h> -#include <camel/camel-string-utils.h> - #include <libebook/e-book.h> #include "em-filter-editor.h" @@ -542,10 +537,6 @@ em_utils_flag_for_followup_completed (GtkWindow *parent, CamelFolder *folder, GP em_utils_uids_free (uids); } -#include "camel/camel-stream-mem.h" -#include "camel/camel-stream-filter.h" -#include "camel/camel-mime-filter-from.h" - /* This kind of sucks, because for various reasons most callers need to run synchronously in the gui thread, however this could take a long, blocking time, to run */ static gint diff --git a/mail/em-utils.h b/mail/em-utils.h index 1bbde206ff..1fde390d72 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -25,12 +25,7 @@ #include <gtk/gtk.h> #include <sys/types.h> -#include <camel/camel-exception.h> -#include <camel/camel-folder.h> -#include <camel/camel-internet-address.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-stream.h> +#include <camel/camel.h> #include <mail/e-mail-reader.h> #include <mail/em-folder-tree.h> diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index d151c47f53..e32d319eac 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -30,7 +30,6 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> -#include "camel/camel-url.h" #include "em-vfolder-context.h" #include "em-vfolder-rule.h" #include "mail/e-mail-store.h" diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index e18da4535d..c9ddcf75d5 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -38,8 +38,6 @@ #include <gconf/gconf-client.h> -#include <camel/camel-operation.h> - #include "mail-importer.h" #include "mail/mail-mt.h" diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 2cd8c9864f..758b8a8b62 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -38,8 +38,6 @@ #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <camel/camel-exception.h> - #include "shell/e-shell.h" #include "shell/e-shell-window.h" #include "shell/e-shell-view.h" diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index f61ce2658b..2f2a7f5494 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -35,14 +35,7 @@ #include <glib.h> #include <glib/gstdio.h> - #include <glib/gi18n.h> -#include <camel/camel-folder.h> -#include <camel/camel-store.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-mime-parser.h> -#include <camel/camel-exception.h> -#include <camel/camel-stream-mem.h> #include "e-util/e-util-private.h" #include "shell/e-shell-backend.h" diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 7758c0e563..5f2f8c8b26 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -25,7 +25,7 @@ #define __MAIL_IMPORTER_H__ #include <e-util/e-import.h> -#include <camel/camel-folder.h> +#include <camel/camel.h> EImportImporter *mbox_importer_peek(void); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index 873fc93c46..07b7f22fbb 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -41,8 +41,6 @@ #include <libebook/e-book.h> #include <libebook/e-destination.h> -#include <camel/camel-operation.h> - #include "mail-importer.h" #include "mail/mail-mt.h" diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index dd6e64afac..dd0423ae07 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -47,9 +47,6 @@ #include "filter/e-filter-option.h" #include "filter/e-filter-input.h" -#include <camel/camel-internet-address.h> -#include <camel/camel-mime-message.h> - #define d(x) static void diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index fb474ab04d..2d14120e71 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -24,7 +24,7 @@ #ifndef _MAIL_AUTOFILTER_H #define _MAIL_AUTOFILTER_H -#include <camel/camel-mime-message.h> +#include <camel/camel.h> #include <filter/e-filter-rule.h> #include <mail/em-filter-context.h> diff --git a/mail/mail-config.h b/mail/mail-config.h index dc55403d93..65dd861940 100644 --- a/mail/mail-config.h +++ b/mail/mail-config.h @@ -24,7 +24,7 @@ #define MAIL_CONFIG_H #include <gtk/gtk.h> -#include <camel/camel-provider.h> +#include <camel/camel.h> #include <libedataserver/e-account.h> #include <libedataserver/e-account-list.h> diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index b1a332d4f4..822afa3b25 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -41,17 +41,10 @@ #include <time.h> #include <glib.h> +#include <glib/gi18n.h> #include <glib-object.h> #include <glib/gstdio.h> -#include <glib/gi18n.h> -#include <camel/camel-store.h> -#include <camel/camel-folder.h> -#include <camel/camel-vtrash-folder.h> -#include <camel/camel-vee-store.h> -#include <camel/camel-offline-store.h> -#include <camel/camel-disco-store.h> - #include <libedataserver/e-data-server-util.h> #include "e-util/e-marshal.h" #include "e-util/e-util.h" diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h index dd3a108d03..de6f90570f 100644 --- a/mail/mail-folder-cache.h +++ b/mail/mail-folder-cache.h @@ -27,7 +27,7 @@ #define _MAIL_FOLDER_CACHE_H #include <glib-object.h> -#include <camel/camel-store.h> +#include <camel/camel.h> G_BEGIN_DECLS diff --git a/mail/mail-mt.c b/mail/mail-mt.c index eefbd6d0d4..0af59cb1bb 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -27,9 +27,6 @@ #include <libedataserver/e-flag.h> -#include <camel/camel-object.h> -#include <camel/camel-operation.h> - #include "shell/e-shell.h" #include "e-util/e-alert-activity.h" #include "e-util/e-alert-dialog.h" diff --git a/mail/mail-mt.h b/mail/mail-mt.h index 2e8828c5b2..5cfbf2abe1 100644 --- a/mail/mail-mt.h +++ b/mail/mail-mt.h @@ -23,8 +23,7 @@ #ifndef _MAIL_MT #define _MAIL_MT -#include "camel/camel-exception.h" -#include "camel/camel-operation.h" +#include <camel/camel.h> typedef struct _MailMsg MailMsg; typedef struct _MailMsgInfo MailMsgInfo; diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 7cbb91bede..c147d22233 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -33,17 +33,6 @@ #include <glib/gstdio.h> #include <glib/gi18n.h> -#include <camel/camel-disco-folder.h> -#include <camel/camel-disco-store.h> -#include <camel/camel-mime-filter-from.h> -#include <camel/camel-offline-folder.h> -#include <camel/camel-offline-store.h> -#include <camel/camel-stream-filter.h> -#include <camel/camel-stream-vfs.h> -#include <camel/camel-transport.h> -#include <camel/camel-vee-folder.h> -#include <camel/camel-vee-store.h> - #include <libedataserver/e-data-server-util.h> #include "e-util/e-account-utils.h" diff --git a/mail/mail-ops.h b/mail/mail-ops.h index 843ada5d54..506de4ce80 100644 --- a/mail/mail-ops.h +++ b/mail/mail-ops.h @@ -26,15 +26,10 @@ G_BEGIN_DECLS -#include "mail-mt.h" - -#include "camel/camel-store.h" -#include "camel/camel-folder.h" -#include "camel/camel-filter-driver.h" -#include "camel/camel-mime-message.h" -#include "camel/camel-operation.h" +#include <camel/camel.h> +#include <libedataserver/e-account.h> -#include "libedataserver/e-account.h" +#include "mail-mt.h" void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, void (*done)(CamelFolder *folder, CamelMimeMessage *msg, CamelMessageInfo *info, gint ok, diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index d66f2ab508..4ffe4fd7a5 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -31,11 +31,6 @@ #include "libedataserver/e-account-list.h" -#include "camel/camel-filter-driver.h" -#include "camel/camel-folder.h" -#include "camel/camel-operation.h" -#include "camel/camel-store.h" - #include "shell/e-shell.h" #include "e-util/e-account-utils.h" #include "e-util/gconf-bridge.h" diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h index 2155a96191..db144e2385 100644 --- a/mail/mail-send-recv.h +++ b/mail/mail-send-recv.h @@ -24,7 +24,7 @@ #define MAIL_SEND_RECV_H #include <gtk/gtk.h> -#include <camel/camel-session.h> +#include <camel/camel.h> #include <shell/e-shell-backend.h> G_BEGIN_DECLS diff --git a/mail/mail-session.c b/mail/mail-session.c index a98857a242..84b6c8e065 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -44,9 +44,6 @@ #include <libedataserverui/e-passwords.h> #include <libedataserver/e-flag.h> -#include <camel/camel.h> /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ -#include <camel/camel-filter-driver.h> - #include "e-util/e-util.h" #include "e-util/e-alert-dialog.h" #include "e-util/e-util-private.h" diff --git a/mail/mail-session.h b/mail/mail-session.h index ff3ee490a1..22dc792b93 100644 --- a/mail/mail-session.h +++ b/mail/mail-session.h @@ -24,7 +24,7 @@ #define MAIL_SESSION_H #include <glib.h> -#include <camel/camel-session.h> +#include <camel/camel.h> G_BEGIN_DECLS diff --git a/mail/mail-tools.c b/mail/mail-tools.c index f006b1b963..7ccf50cc08 100644 --- a/mail/mail-tools.c +++ b/mail/mail-tools.c @@ -36,10 +36,6 @@ #include <glib/gi18n.h> -#include <camel/camel-store.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-movemail.h> - #include "em-utils.h" #include "mail-folder-cache.h" #include "mail-session.h" diff --git a/mail/mail-tools.h b/mail/mail-tools.h index ceb3ce8fb0..544c3601b6 100644 --- a/mail/mail-tools.h +++ b/mail/mail-tools.h @@ -24,8 +24,7 @@ #define MAIL_TOOLS_H #include <glib.h> -#include <camel/camel-folder.h> -#include <camel/camel-mime-message.h> +#include <camel/camel.h> /* Get the "inbox" for a url (uses global session) */ CamelFolder *mail_tool_get_inbox (const gchar *url, CamelException *ex); diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index 2fe7a03c53..700baedbe0 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -27,9 +27,6 @@ #include <glib/gi18n.h> -#include <camel/camel-vee-folder.h> -#include <camel/camel-vee-store.h> -#include <camel/camel-vtrash-folder.h> #include <libedataserver/e-account-list.h> #include "e-util/e-alert-dialog.h" diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h index a70cdd8757..84b6a41151 100644 --- a/mail/mail-vfolder.h +++ b/mail/mail-vfolder.h @@ -22,8 +22,7 @@ #ifndef _MAIL_VFOLDER_H #define _MAIL_VFOLDER_H -#include <camel/camel-internet-address.h> -#include <camel/camel-mime-message.h> +#include <camel/camel.h> #include <filter/e-filter-part.h> #include <filter/e-filter-rule.h> diff --git a/mail/message-list.c b/mail/message-list.c index 657ec02a5c..2c1422bff8 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -36,14 +36,6 @@ #include <gconf/gconf-client.h> -#include <camel/camel-exception.h> -#include <camel/camel-file-utils.h> -#include <camel/camel-folder.h> -#include <camel/camel-folder-thread.h> -#include <camel/camel-folder-summary.h> -#include <camel/camel-vee-folder.h> -#include <camel/camel-string-utils.h> - #include "e-util/e-icon-factory.h" #include "e-util/e-poolv.h" #include "e-util/e-profile-event.h" diff --git a/mail/message-list.h b/mail/message-list.h index a817047cc6..0b46e8ecd7 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -24,11 +24,9 @@ #define _MESSAGE_LIST_H_ #include <gtk/gtk.h> -#include <camel/camel-folder-thread.h> +#include <camel/camel.h> #include <table/e-tree.h> - -#include <camel/camel-folder.h> #include <shell/e-shell-backend.h> G_BEGIN_DECLS diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index bbabb6cfb2..0beb1285fa 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -7,6 +7,7 @@ libevolution_module_calendar_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ + $(CAMEL_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c index b532af85e5..acf975c0bf 100644 --- a/modules/calendar/e-cal-attachment-handler.c +++ b/modules/calendar/e-cal-attachment-handler.c @@ -24,7 +24,7 @@ #include <glib/gi18n.h> #include <libical/ical.h> #include <libecal/e-cal.h> -#include <camel/camel-stream-mem.h> +#include <camel/camel.h> #include <libedataserverui/e-source-selector.h> #include "calendar/common/authentication.h" diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c index 3c52672063..771a889845 100644 --- a/modules/calendar/e-memo-shell-migrate.c +++ b/modules/calendar/e-memo-shell-migrate.c @@ -23,7 +23,7 @@ #include <string.h> #include <glib/gi18n.h> -#include <camel/camel-url.h> +#include <camel/camel.h> #include <libedataserver/e-account.h> #include <libedataserver/e-account-list.h> #include <libedataserver/e-source.h> diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c index 166522a827..f27a107a59 100644 --- a/modules/mail/e-mail-attachment-handler.c +++ b/modules/mail/e-mail-attachment-handler.c @@ -22,8 +22,6 @@ #include "e-mail-attachment-handler.h" #include <glib/gi18n.h> -#include <camel/camel-folder.h> -#include <camel/camel-stream-mem.h> #include "e-util/e-alert-dialog.h" #include "mail/em-composer-utils.h" diff --git a/modules/mail/e-mail-junk-hook.c b/modules/mail/e-mail-junk-hook.c index f17290f99d..ae87df1b30 100644 --- a/modules/mail/e-mail-junk-hook.c +++ b/modules/mail/e-mail-junk-hook.c @@ -22,7 +22,6 @@ #include "e-mail-junk-hook.h" #include <glib/gi18n.h> -#include <camel/camel-junk-plugin.h> #include "e-util/e-alert-dialog.h" #include "shell/e-shell.h" diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index b3eb0a97c1..105b55285a 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -22,10 +22,6 @@ #include "e-mail-shell-backend.h" #include <glib/gi18n.h> -#include <camel/camel-disco-store.h> -#include <camel/camel-offline-store.h> -#include <camel/camel-session.h> -#include <camel/camel-url.h> #include "e-util/e-account-utils.h" #include "e-util/e-binding.h" diff --git a/modules/mail/e-mail-shell-backend.h b/modules/mail/e-mail-shell-backend.h index 36f4064e68..031efab150 100644 --- a/modules/mail/e-mail-shell-backend.h +++ b/modules/mail/e-mail-shell-backend.h @@ -24,8 +24,6 @@ #include <mail/e-mail-backend.h> -#include <camel/camel-folder.h> -#include <camel/camel-store.h> #include <e-util/e-signature-list.h> #include <libedataserver/e-account-list.h> diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index 2113dde9ab..7bfced18e8 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -22,7 +22,6 @@ #include "e-mail-shell-content.h" #include <glib/gi18n.h> -#include <camel/camel-store.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 de237aff96..a8a86c5054 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -26,12 +26,6 @@ #include <glib/gi18n.h> #include <gtkhtml/gtkhtml.h> -#include <camel/camel-disco-store.h> -#include <camel/camel-offline-store.h> -#include <camel/camel-operation.h> -#include <camel/camel-vee-folder.h> -#include <camel/camel-vee-store.h> -#include <camel/camel-vtrash-folder.h> #include <camel/camel-search-private.h> /* for camel_search_word */ #include "e-util/e-util.h" diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c index df1cdeef27..0ac397fc72 100644 --- a/modules/mail/em-account-prefs.c +++ b/modules/mail/em-account-prefs.c @@ -30,8 +30,6 @@ #include <config.h> #endif -#include <camel/camel-url.h> - #include <glib/gi18n.h> #include "e-util/e-alert-dialog.h" diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 53a9888a47..c817653d20 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -37,8 +37,6 @@ #include "em-composer-prefs.h" #include "composer/e-msg-composer.h" -#include <camel/camel-iconv.h> - #include <glib/gi18n.h> #include <glib/gstdio.h> diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index f32fbbf284..fb34805409 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -30,7 +30,6 @@ #include "em-mailer-prefs.h" #include "em-format/em-format.h" -#include <camel/camel-iconv.h> #include <gtkhtml/gtkhtml-properties.h> #include <libxml/tree.h> diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c index ee17785fbd..b74406bb47 100644 --- a/plugins/attachment-reminder/attachment-reminder.c +++ b/plugins/attachment-reminder/attachment-reminder.c @@ -30,14 +30,6 @@ #include <e-util/e-config.h> #include <mail/em-config.h> #include <mail/em-event.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-multipart.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-multipart.h> #include <e-util/e-alert-dialog.h> #include <e-util/e-plugin.h> diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c index 9de5512e0f..67e759ff2f 100644 --- a/plugins/audio-inline/audio-inline.c +++ b/plugins/audio-inline/audio-inline.c @@ -27,10 +27,6 @@ #include <gtk/gtk.h> #include <glib/gstdio.h> #include "e-util/e-mktemp.h" -#include "camel/camel-medium.h" -#include "camel/camel-mime-part.h" -#include "camel/camel-stream.h" -#include "camel/camel-stream-fs.h" #include "mail/em-format-hook.h" #include "mail/em-format-html.h" #include "gtkhtml/gtkhtml-embedded.h" diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c index 2c88afd787..aa11e71f3d 100644 --- a/plugins/bbdb/bbdb.c +++ b/plugins/bbdb/bbdb.c @@ -34,7 +34,6 @@ #include <e-util/e-config.h> #include <mail/em-config.h> #include <mail/em-event.h> -#include <camel/camel-mime-message.h> #include <composer/e-msg-composer.h> #include "bbdb.h" diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c index 6d315da575..6c54ad678c 100644 --- a/plugins/bogo-junk-plugin/bf-junk-filter.c +++ b/plugins/bogo-junk-plugin/bf-junk-filter.c @@ -45,11 +45,6 @@ #include <e-util/e-plugin.h> #include "mail/em-config.h" #include <mail/em-junk.h> -#include <camel/camel-data-wrapper.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-mime-parser.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-debug.h> #include <gconf/gconf-client.h> #ifndef BOGOFILTER_BINARY diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c index 60d37800f4..c569c2ee5e 100644 --- a/plugins/external-editor/external-editor.c +++ b/plugins/external-editor/external-editor.c @@ -31,7 +31,6 @@ #include <mail/mail-config.h> #include <e-util/e-alert-dialog.h> #include <e-msg-composer.h> -#include <camel/camel-mime-filter-tohtml.h> #include <glib/gi18n-lib.h> #include <glib-object.h> diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c index 197553a6ae..17d904b549 100644 --- a/plugins/groupwise-features/camel-gw-listener.c +++ b/plugins/groupwise-features/camel-gw-listener.c @@ -27,6 +27,7 @@ #include "camel-gw-listener.h" #include <string.h> #include <glib/gi18n.h> +#include <camel/camel.h> #include <e-gw-connection.h> #include <libedataserverui/e-passwords.h> #include "e-util/e-alert-dialog.h" diff --git a/plugins/groupwise-features/camel-gw-listener.h b/plugins/groupwise-features/camel-gw-listener.h index 1c4cedbe5a..cc545def61 100644 --- a/plugins/groupwise-features/camel-gw-listener.h +++ b/plugins/groupwise-features/camel-gw-listener.h @@ -27,7 +27,6 @@ #include <libedataserver/e-account-list.h> #include<libedataserver/e-source.h> #include<libedataserver/e-source-list.h> -#include <camel/camel-url.h> G_BEGIN_DECLS diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c index b570d6486d..a3ea9be84b 100644 --- a/plugins/groupwise-features/install-shared.c +++ b/plugins/groupwise-features/install-shared.c @@ -33,17 +33,9 @@ #include <shell/e-shell.h> #include <mail/em-config.h> #include <mail/em-event.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-folder.h> -#include <camel/camel-stream.h> -#include <camel/camel-session.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-data-wrapper.h> -#include <camel/camel-multipart.h> #include <mail/em-folder-tree.h> #include <mail/mail-config.h> #include <mail/em-folder-selector.h> -#include <camel/camel-medium.h> #include <e-gw-connection.h> #include <share-folder.h> diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h index d4b59ae480..2e67b8cc8c 100644 --- a/plugins/groupwise-features/junk-settings.h +++ b/plugins/groupwise-features/junk-settings.h @@ -25,7 +25,6 @@ #define __JUNK_SETTINGS_H__ #include <gtk/gtk.h> -#include <camel/camel-store.h> #include <e-gw-connection.h> #define _JUNK_SETTINGS_TYPE (junk_settings_get_type ()) diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c index 3de31b6838..17d5c7a554 100644 --- a/plugins/groupwise-features/mail-retract.c +++ b/plugins/groupwise-features/mail-retract.c @@ -26,8 +26,6 @@ #include <glib/gi18n-lib.h> #include <e-gw-connection.h> -#include <camel/camel-store.h> -#include <camel/camel-folder.h> #include <e-util/e-alert-dialog.h> diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c index bf23e17d82..23a5339c62 100644 --- a/plugins/groupwise-features/proxy-login.c +++ b/plugins/groupwise-features/proxy-login.c @@ -34,8 +34,6 @@ #include <mail/mail-config.h> #include <mail/em-folder-selector.h> #include <mail/em-account-editor.h> -#include <camel/camel-url.h> -#include <camel/camel-store.h> #include <mail/mail-ops.h> #include <libedataserver/e-account.h> #include <e-util/e-util.h> diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c index 0f761c72e7..2d97684a03 100644 --- a/plugins/groupwise-features/proxy.c +++ b/plugins/groupwise-features/proxy.c @@ -45,8 +45,6 @@ #include <libedataserver/e-account-list.h> #include <e-util/e-icon-factory.h> -#include <camel/camel-url.h> -#include <camel/camel-offline-store.h> #include <libedataserverui/e-passwords.h> #include <libedataserverui/e-name-selector.h> #include <proxy.h> diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c index 6e75f9153e..e20be7353b 100644 --- a/plugins/groupwise-features/send-options.c +++ b/plugins/groupwise-features/send-options.c @@ -33,7 +33,6 @@ #include <misc/e-send-options.h> #include <mail/em-config.h> #include <e-gw-connection.h> -#include <camel/camel-url.h> #include <libecal/e-cal-time-util.h> #include <libedataserver/e-source-list.h> #include <libedataserverui/e-passwords.h> diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c index 992664f863..41dde5a9f9 100644 --- a/plugins/groupwise-features/share-folder-common.c +++ b/plugins/groupwise-features/share-folder-common.c @@ -38,11 +38,6 @@ #include <mail/mail-vfolder.h> #include <mail/em-vfolder-rule.h> #include <filter/e-filter-rule.h> -#include <camel/camel-store.h> -#include <camel/camel-session.h> -#include <camel/camel-store.h> -#include <camel/camel-vee-store.h> -#include <camel/camel-folder.h> #include <e-gw-container.h> #include <e-gw-connection.h> #include <shell/e-shell-sidebar.h> diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h index 138266ccef..4df979d4ef 100644 --- a/plugins/groupwise-features/share-folder.h +++ b/plugins/groupwise-features/share-folder.h @@ -25,7 +25,7 @@ #define __SHARE_FOLDER_H__ #include <gtk/gtk.h> -#include <camel/camel-store.h> +#include <camel/camel.h> #include <e-gw-connection.h> #include <libedataserverui/e-name-selector.h> diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c index d8cddd03fe..2a4f304cf5 100644 --- a/plugins/groupwise-features/status-track.c +++ b/plugins/groupwise-features/status-track.c @@ -32,11 +32,6 @@ #include <time.h> #include <gtk/gtk.h> -#include <camel/camel-folder.h> -#include <camel/camel-mime-utils.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-message.h> - #include <mail/e-mail-reader.h> #include <mail/em-utils.h> #include <mail/message-list.h> diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c index c54ba99810..68e7c65564 100644 --- a/plugins/hula-account-setup/camel-hula-listener.c +++ b/plugins/hula-account-setup/camel-hula-listener.c @@ -26,6 +26,7 @@ #include <string.h> #include <glib/gi18n.h> +#include <camel/camel.h> #include <libedataserverui/e-passwords.h> #include <libedataserver/e-account.h> #include "camel-hula-listener.h" diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h index 97c1b33919..3915e4abdb 100644 --- a/plugins/hula-account-setup/camel-hula-listener.h +++ b/plugins/hula-account-setup/camel-hula-listener.h @@ -27,7 +27,6 @@ #include <libedataserver/e-account-list.h> #include<libedataserver/e-source.h> #include<libedataserver/e-source-list.h> -#include <camel/camel-url.h> G_BEGIN_DECLS diff --git a/plugins/image-inline/image-inline.c b/plugins/image-inline/image-inline.c index 5ea1070afb..be9e025c73 100644 --- a/plugins/image-inline/image-inline.c +++ b/plugins/image-inline/image-inline.c @@ -26,9 +26,6 @@ #include <stdlib.h> #include <gtk/gtk.h> #include <glib/gi18n-lib.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-stream-mem.h> #include <gtkhtml/gtkhtml-embedded.h> #include <gtkimageview/gtkimagescrollwin.h> diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c index df567aa020..4d7b1df931 100644 --- a/plugins/imap-features/imap-headers.c +++ b/plugins/imap-features/imap-headers.c @@ -34,9 +34,6 @@ #include <e-util/e-util.h> #include <e-util/e-account-utils.h> -#include <camel/camel-url.h> -#include <camel/camel-exception.h> - #include <glib/gi18n.h> typedef struct _epif_data EPImapFeaturesData; diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c index f5c727b8e0..eecfcaceaf 100644 --- a/plugins/itip-formatter/itip-formatter.c +++ b/plugins/itip-formatter/itip-formatter.c @@ -29,17 +29,6 @@ #include <gtk/gtk.h> #include <glib/gi18n.h> #include <gconf/gconf-client.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-utils.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-folder.h> -#include <camel/camel-vee-folder.h> -#include <camel/camel-multipart.h> -#include <camel/camel-service.h> -#include <camel/camel-store.h> -#include <camel/camel-db.h> #include <libecal/e-cal.h> #include <libecal/e-cal-time-util.h> #include <libedataserverui/e-source-selector.h> diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c index f4368dde3f..83d314685e 100644 --- a/plugins/itip-formatter/itip-view.c +++ b/plugins/itip-formatter/itip-view.c @@ -27,10 +27,6 @@ #include <string.h> #include <glib/gi18n.h> #include <gconf/gconf-client.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-message.h> #include <libedataserver/e-time-utils.h> #include <libedataserver/e-data-server-util.h> #include <libedataserverui/e-source-combo-box.h> diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 72e3881b23..2b0d768098 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -39,8 +39,6 @@ #include <time.h> -#include <camel/camel-folder.h> - #include <e-util/e-binding.h> #include <e-util/e-config.h> #include <e-util/gconf-bridge.h> diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 17bc6a995b..904fe23fd6 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -38,14 +38,6 @@ #include <libedataserver/e-account.h> #include <libedataserverui/e-source-selector-dialog.h> -#include <camel/camel-folder.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-multipart.h> -#include <camel/camel-stream.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-utf8.h> - #include <mail/e-mail-browser.h> #include <mail/em-utils.h> #include <mail/em-format-html.h> diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index 699ec1efd9..2ed27c3e59 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -30,10 +30,6 @@ #include <gtk/gtk.h> #include <gconf/gconf-client.h> -#include "camel/camel-multipart.h" -#include "camel/camel-mime-part.h" -#include "camel/camel-exception.h" -#include "camel/camel-folder.h" #include "composer/e-msg-composer.h" #include "mail/e-mail-browser.h" #include "mail/e-mail-reader.h" diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c index 24bc48521a..756ced9766 100644 --- a/plugins/mark-all-read/mark-all-read.c +++ b/plugins/mark-all-read/mark-all-read.c @@ -32,7 +32,6 @@ #include <mail/em-folder-tree.h> #include <mail/mail-ops.h> #include <mail/mail-mt.h> -#include <camel/camel-vee-folder.h> #include <shell/e-shell-sidebar.h> #include <shell/e-shell-view.h> diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c index edfc8ff3de..7a3417bb3b 100644 --- a/plugins/prefer-plain/prefer-plain.c +++ b/plugins/prefer-plain/prefer-plain.c @@ -30,9 +30,6 @@ #include <string.h> #include <stdio.h> -#include <camel/camel-multipart.h> -#include <camel/camel-mime-part.h> - #include <em-format/em-format.h> #include <mail/em-config.h> #include <mail/em-format-hook.h> diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 68c8a19264..0c6c89b5b9 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -22,7 +22,8 @@ liborg_gnome_pst_import_la_CPPFLAGS = \ $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ - $(LIBPST_CFLAGS) + $(LIBPST_CFLAGS) \ + $(CAMEL_CFLAGS) liborg_gnome_pst_import_la_SOURCES = pst-importer.c @@ -35,7 +36,8 @@ liborg_gnome_pst_import_la_LIBADD = \ $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(LIBPST_LIBS) + $(LIBPST_LIBS) \ + $(CAMEL_LIBS) EXTRA_DIST = org-gnome-pst-import.eplug.xml diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index fa0b61e993..9def7b9fc4 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -52,16 +52,6 @@ #include <libedataserver/e-data-server-util.h> #include <libedataserverui/e-source-selector-dialog.h> -#include <camel/camel-folder.h> -#include <camel/camel-store.h> -#include <camel/camel-exception.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-multipart.h> -#include <camel/camel-data-wrapper.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-file-utils.h> - #include <mail/e-mail-local.h> #include <mail/mail-mt.h> #include <mail/mail-tools.h> diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c index 082e27fd46..15b323424b 100644 --- a/plugins/sa-junk-plugin/em-junk-filter.c +++ b/plugins/sa-junk-plugin/em-junk-filter.c @@ -34,12 +34,6 @@ #include <signal.h> #include <time.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-debug.h> -#include <camel/camel-file-utils.h> -#include <camel/camel-data-wrapper.h> -#include <camel/camel-stream-fs.h> -#include <camel/camel-stream-mem.h> #include <mail/em-junk.h> #include <mail/em-utils.h> #include <e-util/e-mktemp.h> diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index b88e26d29d..cd3d682515 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -30,10 +30,6 @@ #include <gconf/gconf-client.h> #include <e-util/e-config.h> -#include <camel/camel-url.h> -#include <camel/camel-multipart.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-string-utils.h> #include <mail/e-mail-local.h> #include <mail/e-mail-reader.h> diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c index 4c02457e7c..cb9752e324 100644 --- a/plugins/tnef-attachments/tnef-plugin.c +++ b/plugins/tnef-attachments/tnef-plugin.c @@ -40,12 +40,6 @@ #include <libytnef/ytnef.h> #endif -#include <camel/camel-mime-part.h> -#include <camel/camel-folder.h> -#include <camel/camel-exception.h> -#include <camel/camel-multipart.h> -#include <camel/camel-stream-fs.h> - #include <em-format/em-format.h> #include <mail/em-format-hook.h> #include <mail/em-utils.h> diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c index 0aafc8c82d..64cb423650 100644 --- a/plugins/vcard-inline/vcard-inline.c +++ b/plugins/vcard-inline/vcard-inline.c @@ -24,9 +24,6 @@ #include <glib/gi18n-lib.h> #include <libebook/e-book.h> #include <libebook/e-contact.h> -#include <camel/camel-medium.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-stream-mem.h> #include <gtkhtml/gtkhtml-embedded.h> #include "addressbook/gui/merging/eab-contact-merging.h" diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c index 0ded393e72..e850efb5b6 100644 --- a/widgets/misc/e-account-combo-box.c +++ b/widgets/misc/e-account-combo-box.c @@ -22,7 +22,6 @@ #include "e-account-combo-box.h" #include <string.h> -#include <camel/camel-store.h> #define E_ACCOUNT_COMBO_BOX_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/widgets/misc/e-account-combo-box.h b/widgets/misc/e-account-combo-box.h index 12d4be6c72..3c442f1a29 100644 --- a/widgets/misc/e-account-combo-box.h +++ b/widgets/misc/e-account-combo-box.h @@ -23,7 +23,7 @@ #define E_ACCOUNT_COMBO_BOX_H #include <gtk/gtk.h> -#include <camel/camel-session.h> +#include <camel/camel.h> #include <libedataserver/e-account.h> #include <libedataserver/e-account-list.h> diff --git a/widgets/misc/e-account-tree-view.c b/widgets/misc/e-account-tree-view.c index 8c2e21092b..9b083a3f6e 100644 --- a/widgets/misc/e-account-tree-view.c +++ b/widgets/misc/e-account-tree-view.c @@ -22,7 +22,7 @@ #include "e-account-tree-view.h" #include <glib/gi18n.h> -#include <camel/camel-url.h> +#include <camel/camel.h> #define E_ACCOUNT_TREE_VIEW_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c index 9725604865..a52b931a13 100644 --- a/widgets/misc/e-attachment-view.c +++ b/widgets/misc/e-attachment-view.c @@ -24,7 +24,6 @@ #include <config.h> #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <camel/camel-stream-mem.h> #include "e-util/e-binding.h" #include "e-util/e-selection.h" diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c index 4752251905..dee4bd2aa5 100644 --- a/widgets/misc/e-attachment.c +++ b/widgets/misc/e-attachment.c @@ -25,14 +25,6 @@ #include <config.h> #include <glib/gi18n.h> #include <glib/gstdio.h> -#include <camel/camel-iconv.h> -#include <camel/camel-data-wrapper.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-stream-filter.h> -#include <camel/camel-stream-mem.h> -#include <camel/camel-stream-null.h> -#include <camel/camel-stream-vfs.h> -#include <camel/camel-stream-fs.h> #include <libedataserver/e-data-server-util.h> diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h index a6dff74661..7cd655c6ff 100644 --- a/widgets/misc/e-attachment.h +++ b/widgets/misc/e-attachment.h @@ -23,10 +23,7 @@ #define E_ATTACHMENT_H #include <gtk/gtk.h> -#include <camel/camel-cipher-context.h> -#include <camel/camel-mime-part.h> -#include <camel/camel-mime-message.h> -#include <camel/camel-multipart.h> +#include <camel/camel.h> /* Standard GObject macros */ #define E_TYPE_ATTACHMENT \ diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c index 7a0dc6de56..4ff266fc85 100644 --- a/widgets/misc/e-web-view.c +++ b/widgets/misc/e-web-view.c @@ -25,8 +25,7 @@ #include <string.h> #include <glib/gi18n-lib.h> -#include <camel/camel-internet-address.h> -#include <camel/camel-url.h> +#include <camel/camel.h> #include <e-util/e-util.h> #include <e-util/e-binding.h> diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c index 8ad797a9d1..c07293242c 100644 --- a/widgets/table/e-table-sorting-utils.c +++ b/widgets/table/e-table-sorting-utils.c @@ -23,8 +23,7 @@ #include <config.h> #include <string.h> - -#include <camel/camel-string-utils.h> +#include <camel/camel.h> #include "e-util/e-util.h" |