diff options
Diffstat (limited to 'plugins')
33 files changed, 7 insertions, 118 deletions
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" |