diff options
101 files changed, 238 insertions, 338 deletions
diff --git a/doc/reference/evolution-mail-engine/evolution-mail-engine.types b/doc/reference/evolution-mail-engine/evolution-mail-engine.types index 627e220bba..270ed12924 100644 --- a/doc/reference/evolution-mail-engine/evolution-mail-engine.types +++ b/doc/reference/evolution-mail-engine/evolution-mail-engine.types @@ -1,12 +1,4 @@ -#include <libemail-engine/camel-null-store.h> -#include <libemail-engine/camel-sasl-xoauth2.h> -#include <libemail-engine/e-mail-authenticator.h> -#include <libemail-engine/e-mail-junk-filter.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/em-filter-folder-element.h> -#include <libemail-engine/em-vfolder-context.h> -#include <libemail-engine/em-vfolder-rule.h> -#include <libemail-engine/mail-folder-cache.h> +#include <libemail-engine/libemail-engine.h> camel_null_store_get_type camel_sasl_xoauth2_get_type diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c index 3117bec265..9d7a5120ad 100644 --- a/em-format/e-mail-formatter-headers.c +++ b/em-format/e-mail-formatter-headers.c @@ -23,9 +23,10 @@ #include <string.h> #include <glib/gi18n-lib.h> -#include <libemail-engine/e-mail-utils.h> #include <libedataserver/libedataserver.h> + #include <e-util/e-util.h> +#include <libemail-engine/libemail-engine.h> #include <shell/e-shell.h> #include "e-mail-formatter-extension.h" diff --git a/em-format/e-mail-formatter-print-headers.c b/em-format/e-mail-formatter-print-headers.c index 29aa93a278..156d8ace09 100644 --- a/em-format/e-mail-formatter-print-headers.c +++ b/em-format/e-mail-formatter-print-headers.c @@ -26,7 +26,7 @@ #include <camel/camel.h> #include <e-util/e-util.h> -#include <libemail-engine/e-mail-utils.h> +#include <libemail-engine/libemail-engine.h> #include "e-mail-formatter-print.h" #include "e-mail-formatter-utils.h" diff --git a/em-format/e-mail-formatter-quote-headers.c b/em-format/e-mail-formatter-quote-headers.c index e95e0c9489..1ea9f4b1c7 100644 --- a/em-format/e-mail-formatter-quote-headers.c +++ b/em-format/e-mail-formatter-quote-headers.c @@ -26,7 +26,7 @@ #include <camel/camel.h> #include <e-util/e-util.h> -#include <libemail-engine/e-mail-utils.h> +#include <libemail-engine/libemail-engine.h> #include "e-mail-formatter-quote.h" #include "e-mail-formatter-utils.h" diff --git a/em-format/e-mail-formatter-utils.c b/em-format/e-mail-formatter-utils.c index 0e9eda4fdf..0acddd65a8 100644 --- a/em-format/e-mail-formatter-utils.c +++ b/em-format/e-mail-formatter-utils.c @@ -29,8 +29,7 @@ #include <libedataserver/libedataserver.h> #include <e-util/e-util.h> -#include <libemail-engine/e-mail-utils.h> -#include <libemail-engine/mail-config.h> +#include <libemail-engine/libemail-engine.h> static const gchar *addrspec_hdrs[] = { "Sender", "From", "Reply-To", "To", "Cc", "Bcc", diff --git a/em-format/e-mail-parser-headers.c b/em-format/e-mail-parser-headers.c index 76cad8b22a..166e9ac9d1 100644 --- a/em-format/e-mail-parser-headers.c +++ b/em-format/e-mail-parser-headers.c @@ -24,7 +24,7 @@ #include <glib/gi18n-lib.h> #include <e-util/e-util.h> -#include <libemail-engine/e-mail-utils.h> +#include <libemail-engine/libemail-engine.h> #include "e-mail-parser-extension.h" #include "e-mail-part-headers.h" diff --git a/em-format/e-mail-parser-message.c b/em-format/e-mail-parser-message.c index 706518001c..99e1720b61 100644 --- a/em-format/e-mail-parser-message.c +++ b/em-format/e-mail-parser-message.c @@ -24,7 +24,7 @@ #include <glib/gi18n-lib.h> #include <e-util/e-util.h> -#include <libemail-engine/e-mail-utils.h> +#include <libemail-engine/libemail-engine.h> #include "e-mail-parser-extension.h" #include "e-mail-part-utils.h" diff --git a/libemail-engine/Makefile.am b/libemail-engine/Makefile.am index f483fb11dc..15d12c62d6 100644 --- a/libemail-engine/Makefile.am +++ b/libemail-engine/Makefile.am @@ -21,6 +21,7 @@ libemail_engine_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_builddir) \ + -DLIBEMAIL_ENGINE_COMPILATION \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(GTKHTML_CFLAGS) \ @@ -29,6 +30,7 @@ libemail_engine_la_CPPFLAGS = \ libmailengineincludedir = $(privincludedir)/libemail-engine libmailengineinclude_HEADERS = \ + libemail-engine.h \ camel-null-store.h \ camel-sasl-xoauth2.h \ e-mail-authenticator.h \ diff --git a/libemail-engine/camel-null-store.h b/libemail-engine/camel-null-store.h index cedcef4154..aa076dfd2d 100644 --- a/libemail-engine/camel-null-store.h +++ b/libemail-engine/camel-null-store.h @@ -21,6 +21,10 @@ * the account type. This bizarre hack keeps that bizzare hack working * until we can support multiple identities properly. */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef CAMEL_NULL_STORE_H #define CAMEL_NULL_STORE_H diff --git a/libemail-engine/camel-sasl-xoauth2.h b/libemail-engine/camel-sasl-xoauth2.h index 940964b498..fa461447d2 100644 --- a/libemail-engine/camel-sasl-xoauth2.h +++ b/libemail-engine/camel-sasl-xoauth2.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef CAMEL_SASL_XOAUTH2_H #define CAMEL_SASL_XOAUTH2_H diff --git a/libemail-engine/e-mail-authenticator.h b/libemail-engine/e-mail-authenticator.h index 864d32dea0..0f6b19b0aa 100644 --- a/libemail-engine/e-mail-authenticator.h +++ b/libemail-engine/e-mail-authenticator.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef E_MAIL_AUTHENTICATOR_H #define E_MAIL_AUTHENTICATOR_H diff --git a/libemail-engine/e-mail-engine-enums.h b/libemail-engine/e-mail-engine-enums.h index 3b1d3bd127..c63786a780 100644 --- a/libemail-engine/e-mail-engine-enums.h +++ b/libemail-engine/e-mail-engine-enums.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef E_MAIL_ENGINE_ENUMS_H #define E_MAIL_ENGINE_ENUMS_H diff --git a/libemail-engine/e-mail-folder-utils.h b/libemail-engine/e-mail-folder-utils.h index 5217f2d608..c6253b0bab 100644 --- a/libemail-engine/e-mail-folder-utils.h +++ b/libemail-engine/e-mail-folder-utils.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef E_MAIL_FOLDER_UTILS_H #define E_MAIL_FOLDER_UTILS_H diff --git a/libemail-engine/e-mail-junk-filter.h b/libemail-engine/e-mail-junk-filter.h index efcd25f9d9..7b26d34575 100644 --- a/libemail-engine/e-mail-junk-filter.h +++ b/libemail-engine/e-mail-junk-filter.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef E_MAIL_JUNK_FILTER_H #define E_MAIL_JUNK_FILTER_H diff --git a/libemail-engine/e-mail-session-utils.h b/libemail-engine/e-mail-session-utils.h index 6349834d8d..cc498bbc3a 100644 --- a/libemail-engine/e-mail-session-utils.h +++ b/libemail-engine/e-mail-session-utils.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef E_MAIL_SESSION_UTILS_H #define E_MAIL_SESSION_UTILS_H diff --git a/libemail-engine/e-mail-session.h b/libemail-engine/e-mail-session.h index de726436ae..68dd125a35 100644 --- a/libemail-engine/e-mail-session.h +++ b/libemail-engine/e-mail-session.h @@ -22,6 +22,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef E_MAIL_SESSION_H #define E_MAIL_SESSION_H diff --git a/libemail-engine/e-mail-store-utils.h b/libemail-engine/e-mail-store-utils.h index dc2431684a..55ade881f2 100644 --- a/libemail-engine/e-mail-store-utils.h +++ b/libemail-engine/e-mail-store-utils.h @@ -16,6 +16,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef E_MAIL_STORE_UTILS_H #define E_MAIL_STORE_UTILS_H diff --git a/libemail-engine/e-mail-utils.h b/libemail-engine/e-mail-utils.h index a0ea188f9f..f055f3d6aa 100644 --- a/libemail-engine/e-mail-utils.h +++ b/libemail-engine/e-mail-utils.h @@ -19,6 +19,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef E_MAIL_UTILS_H #define E_MAIL_UTILS_H diff --git a/libemail-engine/em-filter-folder-element.h b/libemail-engine/em-filter-folder-element.h index 8c619017a6..d76c93423f 100644 --- a/libemail-engine/em-filter-folder-element.h +++ b/libemail-engine/em-filter-folder-element.h @@ -22,6 +22,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef EM_FILTER_FOLDER_ELEMENT_H #define EM_FILTER_FOLDER_ELEMENT_H diff --git a/libemail-engine/em-vfolder-context.h b/libemail-engine/em-vfolder-context.h index 9e2faf357a..cad3b35b10 100644 --- a/libemail-engine/em-vfolder-context.h +++ b/libemail-engine/em-vfolder-context.h @@ -22,6 +22,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef EM_VFOLDER_CONTEXT_H #define EM_VFOLDER_CONTEXT_H diff --git a/libemail-engine/em-vfolder-rule.h b/libemail-engine/em-vfolder-rule.h index 255485d39a..671d1bca24 100644 --- a/libemail-engine/em-vfolder-rule.h +++ b/libemail-engine/em-vfolder-rule.h @@ -21,6 +21,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef EM_VFOLDER_RULE_H #define EM_VFOLDER_RULE_H diff --git a/libemail-engine/libemail-engine.h b/libemail-engine/libemail-engine.h new file mode 100644 index 0000000000..855610009a --- /dev/null +++ b/libemail-engine/libemail-engine.h @@ -0,0 +1,48 @@ +/* + * libemail-engine.h + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) version 3. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with the program; if not, see <http://www.gnu.org/licenses/> + * + */ + +#ifndef LIBEMAIL_ENGINE_H +#define LIBEMAIL_ENGINE_H + +#define __LIBEMAIL_ENGINE_H_INSIDE__ + +#include <libemail-engine/camel-null-store.h> +#include <libemail-engine/camel-sasl-xoauth2.h> +#include <libemail-engine/e-mail-authenticator.h> +#include <libemail-engine/e-mail-engine-enums.h> +#include <libemail-engine/e-mail-engine-enumtypes.h> +#include <libemail-engine/e-mail-folder-utils.h> +#include <libemail-engine/e-mail-junk-filter.h> +#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/e-mail-session-utils.h> +#include <libemail-engine/e-mail-store-utils.h> +#include <libemail-engine/e-mail-utils.h> +#include <libemail-engine/em-filter-folder-element.h> +#include <libemail-engine/em-vfolder-context.h> +#include <libemail-engine/em-vfolder-rule.h> +#include <libemail-engine/mail-config.h> +#include <libemail-engine/mail-folder-cache.h> +#include <libemail-engine/mail-mt.h> +#include <libemail-engine/mail-ops.h> +#include <libemail-engine/mail-tools.h> +#include <libemail-engine/mail-vfolder.h> + +#undef __LIBEMAIL_ENGINE_H_INSIDE__ + +#endif /* LIBEMAIL_ENGINE_H */ + diff --git a/libemail-engine/mail-config.h b/libemail-engine/mail-config.h index cc836acf95..cfbdbef2e8 100644 --- a/libemail-engine/mail-config.h +++ b/libemail-engine/mail-config.h @@ -20,6 +20,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef MAIL_CONFIG_H #define MAIL_CONFIG_H diff --git a/libemail-engine/mail-folder-cache.h b/libemail-engine/mail-folder-cache.h index 8a91ca56a4..da836b98ec 100644 --- a/libemail-engine/mail-folder-cache.h +++ b/libemail-engine/mail-folder-cache.h @@ -23,6 +23,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef MAIL_FOLDER_CACHE_H #define MAIL_FOLDER_CACHE_H diff --git a/libemail-engine/mail-mt.h b/libemail-engine/mail-mt.h index 3fd5819d0c..34bee2e7f0 100644 --- a/libemail-engine/mail-mt.h +++ b/libemail-engine/mail-mt.h @@ -20,6 +20,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef _MAIL_MT #define _MAIL_MT diff --git a/libemail-engine/mail-ops.h b/libemail-engine/mail-ops.h index dd115ff601..ec9ab739ab 100644 --- a/libemail-engine/mail-ops.h +++ b/libemail-engine/mail-ops.h @@ -21,6 +21,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef MAIL_OPS_H #define MAIL_OPS_H diff --git a/libemail-engine/mail-tools.h b/libemail-engine/mail-tools.h index 94b19c0d12..c56924da54 100644 --- a/libemail-engine/mail-tools.h +++ b/libemail-engine/mail-tools.h @@ -20,6 +20,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef MAIL_TOOLS_H #define MAIL_TOOLS_H diff --git a/libemail-engine/mail-vfolder.h b/libemail-engine/mail-vfolder.h index 00d3e54035..a5b4639e4c 100644 --- a/libemail-engine/mail-vfolder.h +++ b/libemail-engine/mail-vfolder.h @@ -19,6 +19,10 @@ * */ +#if !defined (__LIBEMAIL_ENGINE_H_INSIDE__) && !defined (LIBEMAIL_ENGINE_COMPILATION) +#error "Only <libemail-engine/libemail-engine.h> should be included directly." +#endif + #ifndef _MAIL_VFOLDER_H #define _MAIL_VFOLDER_H diff --git a/mail/e-http-request.c b/mail/e-http-request.c index 971a0eb5c7..5a2601c0e3 100644 --- a/mail/e-http-request.c +++ b/mail/e-http-request.c @@ -16,12 +16,11 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "e-http-request.h" +#include <config.h> +#include <string.h> + #define LIBSOUP_USE_UNSTABLE_REQUEST_API #include <libsoup/soup.h> #include <libsoup/soup-requester.h> @@ -30,10 +29,9 @@ #include <webkit/webkit.h> #include <e-util/e-util.h> -#include <mail/em-utils.h> -#include <libemail-engine/e-mail-engine-enumtypes.h> +#include <libemail-engine/libemail-engine.h> -#include <string.h> +#include <mail/em-utils.h> #include <shell/e-shell.h> diff --git a/mail/e-mail-account-manager.c b/mail/e-mail-account-manager.c index b1c7731910..65a258dcea 100644 --- a/mail/e-mail-account-manager.c +++ b/mail/e-mail-account-manager.c @@ -22,7 +22,8 @@ #include <glib/gi18n-lib.h> #include <gdk/gdkkeysyms.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> + #include <mail/e-mail-account-tree-view.h> #define E_MAIL_ACCOUNT_MANAGER_GET_PRIVATE(obj) \ diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c index b4880325f0..781674e9fb 100644 --- a/mail/e-mail-account-store.c +++ b/mail/e-mail-account-store.c @@ -24,7 +24,7 @@ #include <libebackend/libebackend.h> -#include <libemail-engine/mail-ops.h> +#include <libemail-engine/libemail-engine.h> #include <mail/mail-vfolder-ui.h> diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 0d1c4bf5f1..4e8d773705 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -34,13 +34,6 @@ #include <shell/e-shell.h> -#include <libemail-engine/e-mail-folder-utils.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/e-mail-store-utils.h> -#include <libemail-engine/mail-config.h> -#include <libemail-engine/mail-folder-cache.h> -#include <libemail-engine/mail-ops.h> - #include <mail/e-mail-migrate.h> #include <mail/e-mail-ui-session.h> #include <mail/em-event.h> diff --git a/mail/e-mail-backend.h b/mail/e-mail-backend.h index 0bc94f1318..36ecd02aa8 100644 --- a/mail/e-mail-backend.h +++ b/mail/e-mail-backend.h @@ -27,7 +27,7 @@ #define E_MAIL_BACKEND_H #include <shell/e-shell-backend.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> #include <mail/e-mail-send-account-override.h> /* Standard GObject macros */ diff --git a/mail/e-mail-config-assistant.h b/mail/e-mail-config-assistant.h index de225af921..18698d835d 100644 --- a/mail/e-mail-config-assistant.h +++ b/mail/e-mail-config-assistant.h @@ -20,10 +20,10 @@ #define E_MAIL_CONFIG_ASSISTANT_H #include <gtk/gtk.h> +#include <libemail-engine/libemail-engine.h> #include <mail/e-mail-config-page.h> #include <mail/e-mail-config-service-backend.h> -#include <libemail-engine/e-mail-session.h> /* Standard GObject macros */ #define E_TYPE_MAIL_CONFIG_ASSISTANT \ diff --git a/mail/e-mail-config-defaults-page.c b/mail/e-mail-config-defaults-page.c index 64e29cbb94..f18002dedb 100644 --- a/mail/e-mail-config-defaults-page.c +++ b/mail/e-mail-config-defaults-page.c @@ -23,8 +23,6 @@ #include <libebackend/libebackend.h> -#include <libemail-engine/e-mail-folder-utils.h> - #include <mail/e-mail-config-page.h> #include <mail/em-folder-selection-button.h> diff --git a/mail/e-mail-config-defaults-page.h b/mail/e-mail-config-defaults-page.h index 0f6371ce08..0a00f464e3 100644 --- a/mail/e-mail-config-defaults-page.h +++ b/mail/e-mail-config-defaults-page.h @@ -20,7 +20,7 @@ #define E_MAIL_CONFIG_DEFAULTS_PAGE_H #include <gtk/gtk.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> #include <mail/e-mail-config-page.h> diff --git a/mail/e-mail-config-notebook.h b/mail/e-mail-config-notebook.h index 3e816c69b4..2c35d946ec 100644 --- a/mail/e-mail-config-notebook.h +++ b/mail/e-mail-config-notebook.h @@ -20,8 +20,7 @@ #define E_MAIL_CONFIG_NOTEBOOK_H #include <gtk/gtk.h> - -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> #include <mail/e-mail-config-page.h> diff --git a/mail/e-mail-config-window.h b/mail/e-mail-config-window.h index 6699e8ad38..d4d49636d2 100644 --- a/mail/e-mail-config-window.h +++ b/mail/e-mail-config-window.h @@ -20,8 +20,7 @@ #define E_MAIL_CONFIG_WINDOW_H #include <gtk/gtk.h> - -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define E_TYPE_MAIL_CONFIG_WINDOW \ diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c index 0a8f237805..789766934f 100644 --- a/mail/e-mail-folder-pane.c +++ b/mail/e-mail-folder-pane.c @@ -28,11 +28,10 @@ #include <string.h> #include <glib/gi18n.h> -#include "shell/e-shell.h" -#include "shell/e-shell-utils.h" +#include <shell/e-shell.h> +#include <shell/e-shell-utils.h> -#include "libemail-engine/e-mail-utils.h" -#include "libemail-engine/mail-tools.h" +#include <libemail-engine/libemail-engine.h> #include "e-mail-reader.h" #include "e-mail-reader-utils.h" diff --git a/mail/e-mail-junk-options.c b/mail/e-mail-junk-options.c index 34793dad6a..7d93a86c5f 100644 --- a/mail/e-mail-junk-options.c +++ b/mail/e-mail-junk-options.c @@ -21,8 +21,6 @@ #include <config.h> #include <glib/gi18n-lib.h> -#include <libemail-engine/e-mail-junk-filter.h> - #define E_MAIL_JUNK_OPTIONS_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), E_TYPE_MAIL_JUNK_OPTIONS, EMailJunkOptionsPrivate)) diff --git a/mail/e-mail-junk-options.h b/mail/e-mail-junk-options.h index 7e9108e7b7..15e8c88244 100644 --- a/mail/e-mail-junk-options.h +++ b/mail/e-mail-junk-options.h @@ -20,7 +20,7 @@ #define E_MAIL_JUNK_OPTIONS_H #include <gtk/gtk.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define E_TYPE_MAIL_JUNK_OPTIONS \ diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c index 4a50e7c375..e982b402ed 100644 --- a/mail/e-mail-migrate.c +++ b/mail/e-mail-migrate.c @@ -46,10 +46,10 @@ #include <libxml/parser.h> #include <libxml/xmlmemory.h> -#include "shell/e-shell.h" -#include "shell/e-shell-migrate.h" +#include <shell/e-shell.h> +#include <shell/e-shell-migrate.h> -#include "libemail-engine/e-mail-folder-utils.h" +#include <libemail-engine/libemail-engine.h> #include "e-mail-backend.h" #include "em-utils.h" diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c index f8b008a45c..550e44de93 100644 --- a/mail/e-mail-paned-view.c +++ b/mail/e-mail-paned-view.c @@ -20,20 +20,14 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "e-mail-paned-view.h" +#include <config.h> #include <glib/gi18n.h> -#include "shell/e-shell-window-actions.h" +#include <shell/e-shell-window-actions.h> -#include "libemail-engine/e-mail-folder-utils.h" -#include "libemail-engine/e-mail-utils.h" -#include "libemail-engine/mail-config.h" -#include "libemail-engine/mail-ops.h" +#include <libemail-engine/libemail-engine.h> #include "em-utils.h" #include "message-list.h" diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 512af51d62..78f442d806 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -32,17 +32,14 @@ #include <gtkhtml/gtkhtml.h> #include <camel/camel.h> -#include "shell/e-shell-utils.h" +#include <shell/e-shell-utils.h> -#include "libemail-engine/e-mail-folder-utils.h" -#include "libemail-engine/e-mail-utils.h" -#include "libemail-engine/mail-ops.h" -#include "libemail-engine/mail-tools.h" +#include <libemail-engine/libemail-engine.h> -#include "em-format/e-mail-parser.h" -#include "em-format/e-mail-part-utils.h" +#include <em-format/e-mail-parser.h> +#include <em-format/e-mail-part-utils.h> -#include "composer/e-composer-actions.h" +#include <composer/e-composer-actions.h> #include "e-mail-backend.h" #include "e-mail-browser.h" diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index aee670d60a..9fbed51270 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -32,15 +32,13 @@ #include <X11/XF86keysym.h> #endif -#include "shell/e-shell-utils.h" +#include <shell/e-shell-utils.h> -#include "libemail-engine/e-mail-utils.h" -#include "libemail-engine/mail-mt.h" -#include "libemail-engine/mail-ops.h" +#include <libemail-engine/libemail-engine.h> -#include "em-format/e-mail-formatter.h" -#include "em-format/e-mail-parser.h" -#include "em-format/e-mail-part-utils.h" +#include <em-format/e-mail-formatter.h> +#include <em-format/e-mail-parser.h> +#include <em-format/e-mail-part-utils.h> #include "e-mail-backend.h" #include "e-mail-browser.h" diff --git a/mail/e-mail-sidebar.c b/mail/e-mail-sidebar.c index 20cf41404c..41d6d5d685 100644 --- a/mail/e-mail-sidebar.c +++ b/mail/e-mail-sidebar.c @@ -19,17 +19,12 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "e-mail-sidebar.h" +#include <config.h> #include <string.h> #include <camel/camel.h> -#include <libemail-engine/e-mail-folder-utils.h> - #include "mail/em-utils.h" #define E_MAIL_SIDEBAR_GET_PRIVATE(obj) \ diff --git a/mail/e-mail-sidebar.h b/mail/e-mail-sidebar.h index a57b6d45f8..de1ba44e75 100644 --- a/mail/e-mail-sidebar.h +++ b/mail/e-mail-sidebar.h @@ -23,7 +23,7 @@ #define E_MAIL_SIDEBAR_H #include <mail/em-folder-tree.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define E_TYPE_MAIL_SIDEBAR \ diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c index f76b94c142..667fd1b09f 100644 --- a/mail/e-mail-ui-session.c +++ b/mail/e-mail-ui-session.c @@ -54,20 +54,13 @@ #include "shell/e-shell-content.h" #include "shell/e-shell-window.h" -#include "libemail-engine/e-mail-folder-utils.h" -#include "libemail-engine/e-mail-junk-filter.h" -#include "libemail-engine/e-mail-session.h" #include "e-mail-ui-session.h" #include "em-composer-utils.h" #include "em-filter-context.h" #include "em-vfolder-editor-context.h" #include "em-filter-rule.h" #include "em-utils.h" -#include "libemail-engine/mail-config.h" -#include "libemail-engine/mail-mt.h" -#include "libemail-engine/mail-ops.h" #include "mail-send-recv.h" -#include "libemail-engine/mail-tools.h" #define E_MAIL_UI_SESSION_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/mail/e-mail-ui-session.h b/mail/e-mail-ui-session.h index 99e2b22fb6..6b371459e3 100644 --- a/mail/e-mail-ui-session.h +++ b/mail/e-mail-ui-session.h @@ -29,8 +29,7 @@ #include <camel/camel.h> #include <e-util/e-util.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/mail-folder-cache.h> +#include <libemail-engine/libemail-engine.h> #include <mail/e-mail-account-store.h> #include <mail/e-mail-label-list-store.h> diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c index 507f12f91b..62405fdb5b 100644 --- a/mail/em-composer-utils.c +++ b/mail/em-composer-utils.c @@ -32,13 +32,7 @@ #include <e-util/e-util.h> -#include <libemail-engine/e-mail-folder-utils.h> -#include <libemail-engine/e-mail-session-utils.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/e-mail-utils.h> -#include <libemail-engine/mail-mt.h> -#include <libemail-engine/mail-ops.h> -#include <libemail-engine/mail-tools.h> +#include <libemail-engine/libemail-engine.h> #include <em-format/e-mail-parser.h> #include <em-format/e-mail-formatter-quote.h> diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h index c3f39d642a..b392bdbdad 100644 --- a/mail/em-filter-context.h +++ b/mail/em-filter-context.h @@ -26,7 +26,7 @@ #define EM_FILTER_CONTEXT_H #include <e-util/e-util.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define EM_TYPE_FILTER_CONTEXT \ diff --git a/mail/em-filter-editor-folder-element.c b/mail/em-filter-editor-folder-element.c index 0d2f5d6b8e..2121d6d0e7 100644 --- a/mail/em-filter-editor-folder-element.c +++ b/mail/em-filter-editor-folder-element.c @@ -22,12 +22,9 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "em-filter-editor-folder-element.h" +#include <config.h> #include <string.h> #include <gtk/gtk.h> diff --git a/mail/em-filter-editor-folder-element.h b/mail/em-filter-editor-folder-element.h index a1d7381c45..7ec2e27b64 100644 --- a/mail/em-filter-editor-folder-element.h +++ b/mail/em-filter-editor-folder-element.h @@ -26,8 +26,7 @@ #define EM_FILTER_EDITOR_FOLDER_ELEMENT_H #include <e-util/e-util.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/em-filter-folder-element.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define EM_TYPE_FILTER_EDITOR_FOLDER_ELEMENT \ diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c index b08c117d34..d6fbd704e1 100644 --- a/mail/em-filter-source-element.c +++ b/mail/em-filter-source-element.c @@ -21,12 +21,9 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "em-filter-source-element.h" +#include <config.h> #include <string.h> #include <gtk/gtk.h> diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h index f66a3892be..0f5d9de8a3 100644 --- a/mail/em-filter-source-element.h +++ b/mail/em-filter-source-element.h @@ -25,7 +25,7 @@ #define EM_FILTER_SOURCE_ELEMENT_H #include <e-util/e-util.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define EM_TYPE_FILTER_SOURCE_ELEMENT \ diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index a3a9e94875..d0ec478dd5 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -33,9 +33,7 @@ #include <shell/e-shell.h> -#include <libemail-engine/e-mail-folder-utils.h> -#include <libemail-engine/mail-mt.h> -#include <libemail-engine/mail-ops.h> +#include <libemail-engine/libemail-engine.h> #include <e-util/e-util.h> diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h index 08eb2f08d6..663bcaa49e 100644 --- a/mail/em-folder-properties.h +++ b/mail/em-folder-properties.h @@ -25,7 +25,7 @@ #define __EM_FOLDER_PROPERTIES_H__ #include <camel/camel.h> -#include <libemail-engine/e-mail-session.h> +#include <e-util/e-util.h> G_BEGIN_DECLS diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c index 3779eef5e5..23ce76acda 100644 --- a/mail/em-folder-selection-button.c +++ b/mail/em-folder-selection-button.c @@ -20,22 +20,19 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "em-folder-selection-button.h" +#include <config.h> #include <string.h> #include <glib/gi18n.h> #include <e-util/e-util.h> -#include <libemail-engine/e-mail-folder-utils.h> +#include <libemail-engine/libemail-engine.h> #include "em-folder-tree.h" #include "em-folder-selector.h" #include "em-utils.h" -#include "em-folder-selection-button.h" - #define EM_FOLDER_SELECTION_BUTTON_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ ((obj), EM_TYPE_FOLDER_SELECTION_BUTTON, EMFolderSelectionButtonPrivate)) diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h index 945f1dab0b..1cb202e373 100644 --- a/mail/em-folder-selection-button.h +++ b/mail/em-folder-selection-button.h @@ -25,7 +25,7 @@ #define EM_FOLDER_SELECTION_BUTTON_H #include <gtk/gtk.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define EM_TYPE_FOLDER_SELECTION_BUTTON \ diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c index 7d35674e11..3f4f26205d 100644 --- a/mail/em-folder-selector.c +++ b/mail/em-folder-selector.c @@ -21,18 +21,16 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "em-folder-selector.h" +#include <config.h> #include <string.h> #include <glib/gi18n.h> -#include <e-util/e-util.h> -#include <libemail-engine/e-mail-session.h> +#include <e-util/e-util.h> +#include <libemail-engine/libemail-engine.h> #include "em-folder-tree.h" -#include "em-folder-selector.h" #include "em-folder-utils.h" #include "em-utils.h" diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index a7039f28d1..69c80959b1 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -20,12 +20,9 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "em-folder-tree-model.h" +#include <config.h> #include <stdio.h> #include <string.h> #include <sys/types.h> @@ -39,23 +36,11 @@ #include <e-util/e-util.h> #include <shell/e-shell.h> -#include <libemail-engine/e-mail-folder-utils.h> -#include <libemail-engine/mail-folder-cache.h> -#include <libemail-engine/mail-mt.h> -#include <libemail-engine/mail-ops.h> -#include <libemail-engine/mail-tools.h> - -#include <e-mail-account-store.h> -#include <e-mail-ui-session.h> -#include <em-utils.h> -#include <em-folder-utils.h> -#include <em-event.h> - -#define EM_FOLDER_TREE_MODEL_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), EM_TYPE_FOLDER_TREE_MODEL, EMFolderTreeModelPrivate)) - -#define d(x) +#include "e-mail-account-store.h" +#include "e-mail-ui-session.h" +#include "em-utils.h" +#include "em-folder-utils.h" +#include "em-event.h" #define EM_FOLDER_TREE_MODEL_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h index af8acd72ff..6d9f211eea 100644 --- a/mail/em-folder-tree-model.h +++ b/mail/em-folder-tree-model.h @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <camel/camel.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define EM_TYPE_FOLDER_TREE_MODEL \ diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index fb2441b1d5..27091e2f5c 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -20,10 +20,9 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "em-folder-tree.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -37,18 +36,10 @@ #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> -#include <glib/gi18n.h> #include "em-vfolder-editor-rule.h" -#include "libemail-engine/e-mail-folder-utils.h" -#include "libemail-engine/e-mail-session.h" -#include "libemail-engine/mail-mt.h" -#include "libemail-engine/mail-ops.h" -#include "libemail-engine/mail-tools.h" - #include "em-utils.h" -#include "em-folder-tree.h" #include "em-folder-utils.h" #include "em-folder-selector.h" #include "em-folder-properties.h" diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h index 97c985c9ab..adf4528c35 100644 --- a/mail/em-folder-tree.h +++ b/mail/em-folder-tree.h @@ -27,7 +27,7 @@ #include <gtk/gtk.h> #include <e-util/e-util.h> #include <mail/em-folder-tree-model.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define EM_TYPE_FOLDER_TREE \ diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c index f96f7d18cd..5633abc8f8 100644 --- a/mail/em-folder-utils.c +++ b/mail/em-folder-utils.c @@ -20,10 +20,9 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "em-folder-utils.h" +#include <config.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -39,24 +38,14 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #include <glib/gi18n.h> -#include "e-util/e-util.h" +#include <e-util/e-util.h> #include "em-vfolder-editor-rule.h" -#include "libemail-engine/e-mail-folder-utils.h" -#include "libemail-engine/e-mail-session.h" -#include "libemail-engine/e-mail-store-utils.h" -#include "libemail-engine/e-mail-utils.h" -#include "libemail-engine/mail-folder-cache.h" -#include "libemail-engine/mail-mt.h" -#include "libemail-engine/mail-ops.h" -#include "libemail-engine/mail-tools.h" - #include "e-mail-ui-session.h" #include "em-utils.h" #include "em-folder-tree.h" #include "em-folder-tree-model.h" -#include "em-folder-utils.h" #include "em-folder-selector.h" #include "em-folder-properties.h" #include "mail-vfolder-ui.h" diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h index db3853042c..4701db9c5f 100644 --- a/mail/em-folder-utils.h +++ b/mail/em-folder-utils.h @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <camel/camel.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> #include <mail/em-folder-tree.h> G_BEGIN_DECLS diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c index 77fb6b2bb1..52a7314ec5 100644 --- a/mail/em-subscription-editor.c +++ b/mail/em-subscription-editor.c @@ -16,20 +16,13 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "em-subscription-editor.h" +#include <config.h> #include <string.h> #include <glib/gi18n-lib.h> -#include "libemail-engine/mail-mt.h" -#include "libemail-engine/mail-tools.h" -#include "libemail-engine/mail-ops.h" - -#include "e-util/e-util.h" +#include <e-util/e-util.h> #include "em-folder-utils.h" @@ -44,10 +37,6 @@ ((folder_info) != NULL && \ ((folder_info)->flags & CAMEL_FOLDER_SUBSCRIBED) != 0) -#define EM_SUBSCRIPTION_EDITOR_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE \ - ((obj), EM_TYPE_SUBSCRIPTION_EDITOR, EMSubscriptionEditorPrivate)) - typedef struct _AsyncContext AsyncContext; typedef struct _TreeRowData TreeRowData; typedef struct _StoreData StoreData; diff --git a/mail/em-subscription-editor.h b/mail/em-subscription-editor.h index b9abedb166..856b49e149 100644 --- a/mail/em-subscription-editor.h +++ b/mail/em-subscription-editor.h @@ -21,7 +21,7 @@ #include <gtk/gtk.h> #include <camel/camel.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define EM_TYPE_SUBSCRIPTION_EDITOR \ diff --git a/mail/em-utils.c b/mail/em-utils.c index 03a6ce56a1..db68b96003 100644 --- a/mail/em-utils.c +++ b/mail/em-utils.c @@ -20,10 +20,9 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "em-utils.h" +#include <config.h> #include <stdio.h> #include <string.h> #include <sys/types.h> @@ -42,25 +41,17 @@ #undef interface #endif -#include "em-filter-editor.h" - #include <libebook/libebook.h> -#include "shell/e-shell.h" +#include <shell/e-shell.h> -#include "em-format/e-mail-parser.h" -#include "em-format/e-mail-formatter-quote.h" - -#include "libemail-engine/e-mail-folder-utils.h" -#include "libemail-engine/e-mail-session.h" -#include "libemail-engine/mail-mt.h" -#include "libemail-engine/mail-ops.h" -#include "libemail-engine/mail-tools.h" +#include <em-format/e-mail-parser.h> +#include <em-format/e-mail-formatter-quote.h> +#include "e-mail-printer.h" #include "e-mail-tag-editor.h" #include "em-composer-utils.h" -#include "em-utils.h" -#include "e-mail-printer.h" +#include "em-filter-editor.h" /* How many is too many? */ /* Used in em_util_ask_open_many() */ diff --git a/mail/em-utils.h b/mail/em-utils.h index cb71f155f5..d23dc396b7 100644 --- a/mail/em-utils.h +++ b/mail/em-utils.h @@ -27,8 +27,7 @@ #include <sys/types.h> #include <camel/camel.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/e-mail-utils.h> +#include <libemail-engine/libemail-engine.h> #include <mail/e-mail-reader.h> #include <mail/em-folder-tree.h> diff --git a/mail/em-vfolder-editor-context.h b/mail/em-vfolder-editor-context.h index e131d92c11..3886f1d04c 100644 --- a/mail/em-vfolder-editor-context.h +++ b/mail/em-vfolder-editor-context.h @@ -26,8 +26,7 @@ #define EM_VFOLDER_EDITOR_CONTEXT_H #include <e-util/e-util.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/em-vfolder-context.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define EM_TYPE_VFOLDER_EDITOR_CONTEXT \ diff --git a/mail/em-vfolder-editor-rule.c b/mail/em-vfolder-editor-rule.c index 1319bdcee0..9d85356537 100644 --- a/mail/em-vfolder-editor-rule.c +++ b/mail/em-vfolder-editor-rule.c @@ -21,10 +21,9 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "em-vfolder-editor-rule.h" +#include <config.h> #include <string.h> #include <gtk/gtk.h> @@ -35,13 +34,10 @@ #include <e-util/e-util.h> #include <e-util/e-util-private.h> -#include <libemail-engine/e-mail-folder-utils.h> - #include "em-folder-selector.h" #include "em-folder-tree.h" #include "em-utils.h" #include "em-vfolder-editor-context.h" -#include "em-vfolder-editor-rule.h" #define EM_VFOLDER_EDITOR_RULE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/mail/em-vfolder-editor-rule.h b/mail/em-vfolder-editor-rule.h index 080ce49e3e..617bcd24b9 100644 --- a/mail/em-vfolder-editor-rule.h +++ b/mail/em-vfolder-editor-rule.h @@ -25,8 +25,7 @@ #define EM_VFOLDER_EDITOR_RULE_H #include <e-util/e-util.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/em-vfolder-rule.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define EM_TYPE_VFOLDER_EDITOR_RULE \ diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c index 97ee58d474..c8975bf2c0 100644 --- a/mail/importers/elm-importer.c +++ b/mail/importers/elm-importer.c @@ -21,10 +21,7 @@ * */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif - #include <stdio.h> #include <errno.h> #include <sys/types.h> @@ -38,7 +35,6 @@ #include "mail-importer.h" -#include "libemail-engine/mail-mt.h" #include "mail/e-mail-backend.h" #include "shell/e-shell.h" diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 3149441ff9..5eb59e82f0 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -21,10 +21,7 @@ * */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif - #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -44,8 +41,6 @@ #include "shell/e-shell-view.h" #include "shell/e-shell-sidebar.h" -#include "libemail-engine/mail-mt.h" - #include "mail/e-mail-backend.h" #include "mail/em-folder-selection-button.h" #include "mail/em-folder-tree-model.h" diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c index a54cd08a82..0af34a3861 100644 --- a/mail/importers/mail-importer.c +++ b/mail/importers/mail-importer.c @@ -21,10 +21,9 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "mail-importer.h" +#include <config.h> #include <errno.h> #include <string.h> #include <sys/types.h> @@ -39,12 +38,6 @@ #include "e-util/e-util-private.h" #include "shell/e-shell-backend.h" -#include "libemail-engine/e-mail-session.h" -#include "libemail-engine/mail-mt.h" -#include "libemail-engine/mail-tools.h" - -#include "mail-importer.h" - struct _import_mbox_msg { MailMsg base; diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h index 11e97955d6..fcbd298895 100644 --- a/mail/importers/mail-importer.h +++ b/mail/importers/mail-importer.h @@ -26,7 +26,7 @@ #include <camel/camel.h> #include <e-util/e-util.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> EImportImporter *mbox_importer_peek (void); diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c index 4fd5f37e93..f5ae3fdd28 100644 --- a/mail/importers/pine-importer.c +++ b/mail/importers/pine-importer.c @@ -21,10 +21,7 @@ * */ -#ifdef HAVE_CONFIG_H #include <config.h> -#endif - #include <stdio.h> #include <errno.h> #include <sys/types.h> @@ -40,7 +37,6 @@ #include "mail-importer.h" -#include "libemail-engine/mail-mt.h" #include "mail/e-mail-backend.h" #include "shell/e-shell.h" diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c index 62d1f6ee92..af18cb525b 100644 --- a/mail/mail-autofilter.c +++ b/mail/mail-autofilter.c @@ -20,18 +20,12 @@ * * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include <config.h> #include <ctype.h> #include <string.h> - #include <glib/gi18n.h> -#include <libemail-engine/e-mail-folder-utils.h> -#include <libemail-engine/e-mail-session.h> - #include "mail-vfolder-ui.h" #include "mail-autofilter.h" #include "em-utils.h" diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h index 79c879317f..6e62bcd44e 100644 --- a/mail/mail-autofilter.h +++ b/mail/mail-autofilter.h @@ -25,10 +25,9 @@ #define MAIL_AUTOFILTER_H #include <camel/camel.h> +#include <libemail-engine/libemail-engine.h> #include <mail/em-filter-context.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/em-vfolder-context.h> enum { AUTO_SUBJECT = 1, diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index 76859c687e..d524242898 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -20,34 +20,21 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "mail-send-recv.h" +#include <config.h> #include <stdio.h> #include <string.h> - #include <glib/gi18n.h> #include <shell/e-shell.h> #include <e-util/e-util.h> -/* This is our hack, not part of libcamel. */ -#include <libemail-engine/camel-null-store.h> - -#include <libemail-engine/e-mail-folder-utils.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/mail-folder-cache.h> -#include <libemail-engine/mail-mt.h> -#include <libemail-engine/mail-ops.h> -#include <libemail-engine/mail-tools.h> - #include "e-mail-account-store.h" #include "e-mail-ui-session.h" #include "em-event.h" #include "em-filter-rule.h" #include "em-utils.h" -#include "mail-send-recv.h" #define d(x) diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h index fb49493060..ffd0b63143 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 <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> G_BEGIN_DECLS diff --git a/mail/mail-vfolder-ui.c b/mail/mail-vfolder-ui.c index 48b7fcef66..09e2c944b6 100644 --- a/mail/mail-vfolder-ui.c +++ b/mail/mail-vfolder-ui.c @@ -20,24 +20,14 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "mail-vfolder-ui.h" +#include <config.h> #include <string.h> - #include <glib/gi18n.h> #include "e-util/e-util-private.h" -#include "libemail-engine/e-mail-folder-utils.h" -#include "libemail-engine/e-mail-session.h" -#include "libemail-engine/e-mail-utils.h" -#include "libemail-engine/mail-folder-cache.h" -#include "libemail-engine/mail-mt.h" -#include "libemail-engine/mail-ops.h" -#include "libemail-engine/mail-tools.h" - #include "e-mail-backend.h" #include "em-folder-tree-model.h" #include "em-utils.h" @@ -45,7 +35,6 @@ #include "em-vfolder-editor.h" #include "em-vfolder-editor-rule.h" #include "mail-autofilter.h" -#include "mail-vfolder-ui.h" #include "e-mail-ui-session.h" #define d(x) /* (printf("%s:%s: ", G_STRLOC, G_STRFUNC), (x))*/ diff --git a/mail/mail-vfolder-ui.h b/mail/mail-vfolder-ui.h index 07bcaa3fe5..8bd8acdd98 100644 --- a/mail/mail-vfolder-ui.h +++ b/mail/mail-vfolder-ui.h @@ -19,13 +19,12 @@ * */ -#ifndef _MAIL_VFOLDER_UI_H -#define _MAIL_VFOLDER_UI_H +#ifndef MAIL_VFOLDER_UI_H +#define MAIL_VFOLDER_UI_H #include <camel/camel.h> -#include <libemail-engine/em-vfolder-rule.h> -#include <libemail-engine/mail-vfolder.h> +#include <libemail-engine/libemail-engine.h> #include <mail/e-mail-backend.h> #include <shell/e-shell-view.h> @@ -46,4 +45,5 @@ void vfolder_gui_add_from_address (EMailSession *session, CamelInternetAddress *addr, gint flags, CamelFolder *folder); -#endif + +#endif /* MAIL_VFOLDER_UI_H */ diff --git a/mail/message-list.c b/mail/message-list.c index fb4eaf835b..89a473a7ff 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -22,28 +22,18 @@ * */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - #include "message-list.h" +#include <config.h> #include <sys/types.h> #include <sys/stat.h> #include <unistd.h> - #include <string.h> #include <ctype.h> #include <glib/gi18n.h> #include <glib/gstdio.h> -#include "libemail-engine/e-mail-utils.h" -#include "libemail-engine/mail-config.h" -#include "libemail-engine/mail-mt.h" -#include "libemail-engine/mail-ops.h" -#include "libemail-engine/mail-tools.h" - #include "e-mail-label-list-store.h" #include "e-mail-ui-session.h" #include "em-utils.h" diff --git a/mail/message-list.h b/mail/message-list.h index c3233db6a2..89a4c65122 100644 --- a/mail/message-list.h +++ b/mail/message-list.h @@ -27,7 +27,7 @@ #include <camel/camel.h> #include <e-util/e-util.h> -#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define MESSAGE_LIST_TYPE \ diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am index 778a5f7d92..5ea0e06fb8 100644 --- a/modules/bogofilter/Makefile.am +++ b/modules/bogofilter/Makefile.am @@ -6,7 +6,8 @@ module_bogofilter_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-bogofilter\" \ -DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(GTKHTML_CFLAGS) module_bogofilter_la_SOURCES = \ evolution-bogofilter.c @@ -16,7 +17,8 @@ module_bogofilter_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) module_bogofilter_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c index 01374eaa0d..30bcef3fa9 100644 --- a/modules/bogofilter/evolution-bogofilter.c +++ b/modules/bogofilter/evolution-bogofilter.c @@ -27,7 +27,7 @@ #include <camel/camel.h> -#include <libemail-engine/e-mail-junk-filter.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define E_TYPE_BOGOFILTER \ diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c index 769b45ac2c..1c193a4844 100644 --- a/modules/itip-formatter/itip-view.c +++ b/modules/itip-formatter/itip-view.c @@ -34,10 +34,6 @@ #include <calendar/gui/itip-utils.h> -#include <libemail-engine/mail-folder-cache.h> -#include <libemail-engine/mail-mt.h> -#include <libemail-engine/mail-tools.h> - #include <mail/em-config.h> #include <mail/em-utils.h> #include <em-format/e-mail-formatter-utils.h> diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index e71f1497d4..fe220742ed 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -32,11 +32,6 @@ #include <composer/e-msg-composer.h> -#include <libemail-engine/e-mail-folder-utils.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/mail-config.h> -#include <libemail-engine/mail-ops.h> - #include <mail/e-mail-browser.h> #include <mail/e-mail-config-assistant.h> #include <mail/e-mail-config-window.h> diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index 84a7d5fb03..46153f1fb2 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -29,8 +29,6 @@ #include <e-util/e-util-private.h> -#include <libemail-engine/mail-ops.h> - #include <mail/e-mail-paned-view.h> #include <mail/e-mail-reader.h> #include <mail/e-mail-reader-utils.h> diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index 9986feb17f..47694aedc2 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -28,14 +28,6 @@ #include <gtkhtml/gtkhtml.h> #include <camel/camel-search-private.h> /* for camel_search_word */ -#include <libemail-engine/e-mail-folder-utils.h> -#include <libemail-engine/e-mail-session.h> -#include <libemail-engine/e-mail-session-utils.h> -#include <libemail-engine/e-mail-store-utils.h> -#include <libemail-engine/mail-folder-cache.h> -#include <libemail-engine/mail-ops.h> -#include <libemail-engine/mail-tools.h> - #include <mail/e-mail-label-action.h> #include <mail/e-mail-label-dialog.h> #include <mail/e-mail-label-list-store.h> diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index bd2d0390ec..2ce523065a 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -43,8 +43,6 @@ #include <shell/e-shell-utils.h> -#include <libemail-engine/e-mail-folder-utils.h> - #include <mail/em-config.h> #include <mail/em-folder-selection-button.h> #include <mail/em-folder-selector.h> diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c index 225406438b..f4fcfc4906 100644 --- a/modules/mdn/evolution-mdn.c +++ b/modules/mdn/evolution-mdn.c @@ -22,8 +22,6 @@ #include <libebackend/libebackend.h> -#include <libemail-engine/e-mail-session-utils.h> - #include <mail/em-utils.h> #include <mail/e-mail-reader.h> #include <mail/mail-send-recv.h> diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c index 30793ca8a7..85b4b85735 100644 --- a/modules/spamassassin/evolution-spamassassin.c +++ b/modules/spamassassin/evolution-spamassassin.c @@ -26,7 +26,7 @@ #include <camel/camel.h> #include <shell/e-shell.h> -#include <libemail-engine/e-mail-junk-filter.h> +#include <libemail-engine/libemail-engine.h> /* Standard GObject macros */ #define E_TYPE_SPAM_ASSASSIN \ diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c index e21c59fd48..47a2bb94bf 100644 --- a/plugins/dbx-import/dbx-importer.c +++ b/plugins/dbx-import/dbx-importer.c @@ -54,9 +54,6 @@ #include <shell/e-shell-window.h> #include <shell/e-shell-view.h> -#include <libemail-engine/mail-mt.h> -#include <libemail-engine/mail-tools.h> - #include <mail/e-mail-backend.h> #include <mail/em-folder-selection-button.h> #include <mail/em-utils.h> diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c index 1d26f742af..43e0da533c 100644 --- a/plugins/mail-notification/mail-notification.c +++ b/plugins/mail-notification/mail-notification.c @@ -35,7 +35,6 @@ #include <time.h> -#include <libemail-engine/e-mail-folder-utils.h> #include <mail/em-utils.h> #include <mail/em-event.h> #include <mail/em-folder-tree.h> diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 28ce0b1d50..b2c995e0e8 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -34,8 +34,6 @@ #include <libecal/libecal.h> -#include <libemail-engine/e-mail-utils.h> - #include <shell/e-shell-view.h> #include <shell/e-shell-window-actions.h> diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c index e390e9dd2e..d9466013c2 100644 --- a/plugins/mailing-list-actions/mailing-list-actions.c +++ b/plugins/mailing-list-actions/mailing-list-actions.c @@ -37,9 +37,6 @@ #include <composer/e-msg-composer.h> -#include <libemail-engine/mail-mt.h> -#include <libemail-engine/mail-ops.h> - #include <mail/e-mail-browser.h> #include <mail/e-mail-reader.h> #include <mail/em-composer-utils.h> diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c index 914ceb7631..853a16cbd8 100644 --- a/plugins/pst-import/pst-importer.c +++ b/plugins/pst-import/pst-importer.c @@ -42,9 +42,6 @@ #include <libecal/libecal.h> #include <libebook/libebook.h> -#include <libemail-engine/mail-mt.h> -#include <libemail-engine/mail-tools.h> - #include <shell/e-shell.h> #include <shell/e-shell-window.h> #include <shell/e-shell-view.h> diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c index 75e0303fb4..7410d2bd61 100644 --- a/plugins/templates/templates.c +++ b/plugins/templates/templates.c @@ -32,9 +32,6 @@ #include <shell/e-shell-view.h> -#include <libemail-engine/e-mail-session-utils.h> -#include <libemail-engine/mail-ops.h> - #include <mail/e-mail-reader.h> #include <mail/em-composer-utils.h> #include <mail/em-utils.h> |