From 61ae36351b24cc676f60483d576706bf827f2987 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 17 Jan 2012 11:07:19 -0500 Subject: Introduce libemail-engine and libemail-utils. These libraries are bound for E-D-S so they live at the lowest layer of Evolution for now -- even libeutil can link to them (but please don't). This is the first step toward moving mail handing to a D-Bus service. --- modules/bogofilter/Makefile.am | 2 + modules/bogofilter/evolution-bogofilter.c | 2 +- modules/calendar/Makefile.am | 1 + modules/calendar/e-cal-shell-view-private.h | 54 +++++++++-------- modules/calendar/e-memo-shell-migrate.c | 7 ++- modules/mail/Makefile.am | 3 +- modules/mail/e-mail-shell-backend.c | 56 ++++++++++-------- modules/mail/e-mail-shell-content.c | 32 +++++----- modules/mail/e-mail-shell-view-actions.c | 14 +++-- modules/mail/e-mail-shell-view-private.c | 3 +- modules/mail/e-mail-shell-view-private.h | 69 ++++++++++++---------- modules/mail/e-mail-shell-view.c | 2 +- modules/mail/em-account-prefs.c | 25 ++++---- modules/mail/em-composer-prefs.c | 21 ++++--- modules/mail/em-network-prefs.c | 17 +++--- modules/mdn/evolution-mdn.c | 6 +- modules/online-accounts/Makefile.am | 1 + modules/online-accounts/camel-sasl-xoauth.c | 6 +- modules/online-accounts/e-online-accounts-google.c | 2 +- .../online-accounts/evolution-online-accounts.c | 3 +- modules/spamassassin/Makefile.am | 2 + modules/spamassassin/evolution-spamassassin.c | 2 +- modules/startup-wizard/Makefile.am | 2 + modules/startup-wizard/evolution-startup-wizard.c | 6 +- 24 files changed, 192 insertions(+), 146 deletions(-) (limited to 'modules') diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am index 5fbf45e5b4..2d8f5c9fd2 100644 --- a/modules/bogofilter/Makefile.am +++ b/modules/bogofilter/Makefile.am @@ -14,6 +14,8 @@ libevolution_module_bogofilter_la_SOURCES = \ libevolution_module_bogofilter_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/libemail-engine/libemail-engine.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c index 74c1d362ca..0467c0f654 100644 --- a/modules/bogofilter/evolution-bogofilter.c +++ b/modules/bogofilter/evolution-bogofilter.c @@ -23,7 +23,7 @@ #include -#include +#include /* Standard GObject macros */ #define E_TYPE_BOGOFILTER \ diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index 4f09f92692..57b697b0df 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -89,6 +89,7 @@ libevolution_module_calendar_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/widgets/menus/libmenus.la \ diff --git a/modules/calendar/e-cal-shell-view-private.h b/modules/calendar/e-cal-shell-view-private.h index 27aaca6e9e..ad4984a4ef 100644 --- a/modules/calendar/e-cal-shell-view-private.h +++ b/modules/calendar/e-cal-shell-view-private.h @@ -26,6 +26,7 @@ #include #include + #include #include #include @@ -33,31 +34,34 @@ #include #include -#include "e-util/e-account-utils.h" -#include "e-util/e-selection.h" -#include "e-util/e-dialog-utils.h" -#include "e-util/e-file-utils.h" -#include "e-util/e-util.h" -#include "shell/e-shell-utils.h" -#include "misc/e-popup-action.h" -#include "misc/e-selectable.h" - -#include "calendar/gui/calendar-config.h" -#include "calendar/gui/comp-util.h" -#include "calendar/gui/e-cal-list-view.h" -#include "calendar/gui/e-cal-model-tasks.h" -#include "calendar/gui/e-calendar-view.h" -#include "calendar/gui/e-day-view.h" -#include "calendar/gui/e-week-view.h" -#include "calendar/gui/gnome-cal.h" -#include "calendar/gui/print.h" -#include "calendar/gui/dialogs/calendar-setup.h" -#include "calendar/gui/dialogs/copy-source-dialog.h" -#include "calendar/gui/dialogs/event-editor.h" -#include "calendar/gui/dialogs/goto-dialog.h" -#include "calendar/gui/dialogs/memo-editor.h" -#include "calendar/gui/dialogs/select-source-dialog.h" -#include "calendar/gui/dialogs/task-editor.h" +#include +#include +#include +#include + +#include + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "e-cal-shell-backend.h" #include "e-cal-shell-content.h" diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c index 6402cf1e0a..171428f408 100644 --- a/modules/calendar/e-memo-shell-migrate.c +++ b/modules/calendar/e-memo-shell-migrate.c @@ -28,13 +28,14 @@ #include #include #include + #include #include #include -#include "e-util/e-account-utils.h" -#include "calendar/gui/calendar-config-keys.h" -#include "shell/e-shell.h" +#include +#include +#include #include "e-memo-shell-backend.h" diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am index 90cf1aa54f..7fbb354b26 100644 --- a/modules/mail/Makefile.am +++ b/modules/mail/Makefile.am @@ -3,7 +3,6 @@ module_LTLIBRARIES = libevolution-module-mail.la libevolution_module_mail_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/mail \ -I$(top_srcdir)/widgets \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ @@ -51,6 +50,8 @@ libevolution_module_mail_la_SOURCES = \ em-network-prefs.h libevolution_module_mail_la_LIBADD = \ + $(top_builddir)/libemail-utils/libemail-utils.la \ + $(top_builddir)/libemail-engine/libemail-engine.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/filter/libfilter.la \ diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c index d15ca1ebe8..4e28d8c629 100644 --- a/modules/mail/e-mail-shell-backend.c +++ b/modules/mail/e-mail-shell-backend.c @@ -27,37 +27,42 @@ #include -#include "e-util/e-import.h" -#include "e-util/e-util.h" -#include "shell/e-shell.h" -#include "shell/e-shell-window.h" -#include "composer/e-msg-composer.h" -#include "widgets/misc/e-preferences-window.h" -#include "widgets/misc/e-web-view.h" +#include +#include + +#include +#include + +#include + +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "e-mail-shell-settings.h" #include "e-mail-shell-sidebar.h" #include "e-mail-shell-view.h" - -#include "e-mail-browser.h" -#include "e-mail-folder-utils.h" -#include "e-mail-reader.h" -#include "e-mail-session.h" -#include "em-account-editor.h" #include "em-account-prefs.h" #include "em-composer-prefs.h" -#include "em-composer-utils.h" -#include "em-folder-utils.h" -#include "em-format-hook.h" -#include "em-format-html-display.h" #include "em-mailer-prefs.h" #include "em-network-prefs.h" -#include "em-utils.h" -#include "mail-config.h" -#include "mail-ops.h" -#include "mail-send-recv.h" -#include "mail-vfolder.h" -#include "importers/mail-importer.h" #define E_MAIL_SHELL_BACKEND_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ @@ -471,7 +476,7 @@ mail_shell_backend_start (EShellBackend *shell_backend) backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); - account_store = e_mail_session_get_account_store (session); + account_store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION (session)); enable_search_folders = e_shell_settings_get_boolean ( shell_settings, "mail-enable-search-folders"); @@ -646,7 +651,8 @@ e_mail_labels_get_filter_options (void) backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); - label_store = e_mail_session_get_label_store (session); + label_store = e_mail_ui_session_get_label_store ( + E_MAIL_UI_SESSION (session)); model = GTK_TREE_MODEL (label_store); valid = gtk_tree_model_get_iter_first (model, &iter); diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index 56a0c52de6..5bb60e3784 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -28,21 +28,23 @@ #include #include -#include "e-util/e-util-private.h" -#include "widgets/menus/gal-view-etable.h" -#include "widgets/menus/gal-view-instance.h" -#include "widgets/misc/e-paned.h" -#include "widgets/misc/e-preview-pane.h" -#include "widgets/misc/e-search-bar.h" - -#include "em-utils.h" -#include "mail-ops.h" -#include "message-list.h" - -#include "e-mail-paned-view.h" -#include "e-mail-notebook-view.h" -#include "e-mail-reader.h" -#include "e-mail-reader-utils.h" +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include +#include + #include "e-mail-shell-backend.h" #include "e-mail-shell-view-actions.h" diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index 26bcfc4bb8..407f17ef78 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -99,7 +99,7 @@ action_mail_account_disable_cb (GtkAction *action, backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); - account_store = e_mail_session_get_account_store (session); + account_store = e_mail_ui_session_get_account_store (E_MAIL_UI_SESSION (session)); folder_tree = e_mail_shell_sidebar_get_folder_tree (mail_shell_sidebar); store = em_folder_tree_get_selected_store (folder_tree); @@ -709,7 +709,8 @@ action_mail_label_new_cb (GtkAction *action, backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); - label_store = e_mail_session_get_label_store (session); + label_store = e_mail_ui_session_get_label_store ( + E_MAIL_UI_SESSION (session)); label_dialog = E_MAIL_LABEL_DIALOG (dialog); label_name = e_mail_label_dialog_get_label_name (label_dialog); @@ -770,7 +771,8 @@ action_mail_label_none_cb (GtkAction *action, backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); - label_store = e_mail_session_get_label_store (session); + label_store = e_mail_ui_session_get_label_store ( + E_MAIL_UI_SESSION (session)); mail_shell_content = mail_shell_view->priv->mail_shell_content; mail_view = e_mail_shell_content_get_mail_view (mail_shell_content); @@ -1919,7 +1921,8 @@ e_mail_shell_view_update_popup_labels (EMailShellView *mail_shell_view) backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); - label_store = e_mail_session_get_label_store (session); + label_store = e_mail_ui_session_get_label_store ( + E_MAIL_UI_SESSION (session)); action_group = ACTION_GROUP (MAIL_LABEL); merge_id = mail_shell_view->priv->label_merge_id; @@ -2021,7 +2024,8 @@ e_mail_shell_view_update_search_filter (EMailShellView *mail_shell_view) backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); - label_store = e_mail_session_get_label_store (session); + label_store = e_mail_ui_session_get_label_store ( + E_MAIL_UI_SESSION (session)); action_group = ACTION_GROUP (MAIL_FILTER); e_action_group_remove_all_actions (action_group); diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index b7e7f9575b..f43734f175 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -665,7 +665,8 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); - label_store = e_mail_session_get_label_store (session); + label_store = e_mail_ui_session_get_label_store ( + E_MAIL_UI_SESSION (session)); e_shell_window_add_action_group (shell_window, "mail"); e_shell_window_add_action_group (shell_window, "mail-filter"); diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index 24b5e531bf..c60d5c699e 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -28,38 +28,43 @@ #include #include /* for camel_search_word */ -#include "e-util/e-util.h" -#include "e-util/e-account-utils.h" -#include "e-util/e-ui-manager.h" -#include "filter/e-filter-part.h" -#include "widgets/misc/e-web-view.h" -#include "widgets/misc/e-popup-action.h" -#include "widgets/menus/gal-view-instance.h" - -#include "e-mail-folder-utils.h" -#include "e-mail-label-action.h" -#include "e-mail-label-dialog.h" -#include "e-mail-label-list-store.h" -#include "e-mail-reader.h" -#include "e-mail-reader-utils.h" -#include "e-mail-session.h" -#include "e-mail-session-utils.h" -#include "e-mail-sidebar.h" -#include "e-mail-store-utils.h" -#include "em-composer-utils.h" -#include "em-folder-properties.h" -#include "em-folder-selector.h" -#include "em-folder-utils.h" -#include "em-search-context.h" -#include "em-subscription-editor.h" -#include "em-utils.h" -#include "mail-autofilter.h" -#include "mail-folder-cache.h" -#include "mail-ops.h" -#include "mail-send-recv.h" -#include "mail-tools.h" -#include "mail-vfolder.h" -#include "message-list.h" +#include +#include + +#include + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "e-mail-shell-backend.h" #include "e-mail-shell-content.h" diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c index 07fec7e45f..afd7501d92 100644 --- a/modules/mail/e-mail-shell-view.c +++ b/modules/mail/e-mail-shell-view.c @@ -269,7 +269,7 @@ mail_shell_view_execute_search (EShellView *shell_view) folder = e_mail_reader_get_folder (reader); message_list = e_mail_reader_get_message_list (reader); - label_store = e_mail_session_get_label_store (session); + label_store = e_mail_ui_session_get_label_store (E_MAIL_UI_SESSION (session)); action = ACTION (MAIL_SEARCH_SUBJECT_OR_ADDRESSES_CONTAIN); value = gtk_radio_action_get_current_value (GTK_RADIO_ACTION (action)); diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c index 24651d1131..c6b132ebbb 100644 --- a/modules/mail/em-account-prefs.c +++ b/modules/mail/em-account-prefs.c @@ -33,16 +33,20 @@ #include -#include "e-util/e-alert-dialog.h" -#include "e-util/e-account-utils.h" +#include -#include "e-mail-backend.h" -#include "em-config.h" -#include "em-account-editor.h" -#include "em-utils.h" -#include "mail-vfolder.h" -#include "shell/e-shell.h" -#include "capplet/settings/mail-capplet-shell.h" +#include + +#include + +#include + +#include +#include +#include +#include +#include +#include #define EM_ACCOUNT_PREFS_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ @@ -321,7 +325,8 @@ em_account_prefs_new (EPreferencesWindow *window) backend = E_MAIL_BACKEND (shell_backend); session = e_mail_backend_get_session (backend); - account_store = e_mail_session_get_account_store (session); + account_store = e_mail_ui_session_get_account_store ( + E_MAIL_UI_SESSION (session)); return g_object_new ( EM_TYPE_ACCOUNT_PREFS, diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 0dcd1116bb..e678152097 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -24,18 +24,14 @@ #include #endif +#include "em-composer-prefs.h" + #include #include #include #include #include -#include "e-util/e-signature-utils.h" - -#include "em-composer-prefs.h" -#include "composer/e-msg-composer.h" -#include "shell/e-shell-utils.h" - #include #include @@ -44,14 +40,21 @@ #include #include + +#include + +#include + +#include + #include #include #include #include -#include "em-config.h" -#include "em-folder-selection-button.h" -#include "e-mail-junk-options.h" +#include +#include +#include G_DEFINE_TYPE ( EMComposerPrefs, diff --git a/modules/mail/em-network-prefs.c b/modules/mail/em-network-prefs.c index 793925055a..93a12d202a 100644 --- a/modules/mail/em-network-prefs.c +++ b/modules/mail/em-network-prefs.c @@ -24,25 +24,24 @@ #include #endif +#include "em-network-prefs.h" + #include #include #include #include #include -#include "em-network-prefs.h" - +#include #include #include -#include - -#include "e-util/e-util.h" -#include "e-util/e-util-private.h" -#include "mail/e-mail-junk-options.h" +#include +#include -#include "em-config.h" -#include "em-folder-selection-button.h" +#include +#include +#include #define d(x) diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c index fa3fd8171c..d0a1e6d6ee 100644 --- a/modules/mdn/evolution-mdn.c +++ b/modules/mdn/evolution-mdn.c @@ -23,13 +23,15 @@ #include #include -#include + +#include + +#include #include #include #include #include -#include #define MDN_USER_FLAG "receipt-handled" diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am index ccb7ada29a..f449247ec9 100644 --- a/modules/online-accounts/Makefile.am +++ b/modules/online-accounts/Makefile.am @@ -18,6 +18,7 @@ libevolution_module_online_accounts_la_SOURCES = \ libevolution_module_online_accounts_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GOA_LIBS) diff --git a/modules/online-accounts/camel-sasl-xoauth.c b/modules/online-accounts/camel-sasl-xoauth.c index edf5c6eec3..7b1a59aa24 100644 --- a/modules/online-accounts/camel-sasl-xoauth.c +++ b/modules/online-accounts/camel-sasl-xoauth.c @@ -20,11 +20,11 @@ #include #endif -#include +#include -#include "camel-sasl-xoauth.h" +#include -#include +#include "camel-sasl-xoauth.h" #define GOA_API_IS_SUBJECT_TO_CHANGE #include diff --git a/modules/online-accounts/e-online-accounts-google.c b/modules/online-accounts/e-online-accounts-google.c index e71b8d16cb..709eb3bb8e 100644 --- a/modules/online-accounts/e-online-accounts-google.c +++ b/modules/online-accounts/e-online-accounts-google.c @@ -29,7 +29,7 @@ #include #include -#include +#include /* This is the property name or URL parameter under which we * embed the GoaAccount ID into an EAccount or ESource object. */ diff --git a/modules/online-accounts/evolution-online-accounts.c b/modules/online-accounts/evolution-online-accounts.c index d127f4d096..6efeaba33e 100644 --- a/modules/online-accounts/evolution-online-accounts.c +++ b/modules/online-accounts/evolution-online-accounts.c @@ -30,7 +30,8 @@ #include #include -#include + +#include #include "camel-sasl-xoauth.h" #include "e-online-accounts-google.h" diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am index 8ea91303b4..fce8989566 100644 --- a/modules/spamassassin/Makefile.am +++ b/modules/spamassassin/Makefile.am @@ -14,6 +14,8 @@ libevolution_module_spamassassin_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/libemail-engine/libemail-engine.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c index 1b88d0f558..7f595caf32 100644 --- a/modules/spamassassin/evolution-spamassassin.c +++ b/modules/spamassassin/evolution-spamassassin.c @@ -25,7 +25,7 @@ #include #include -#include +#include /* Standard GObject macros */ #define E_TYPE_SPAM_ASSASSIN \ diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am index 2643387010..ebaec22531 100644 --- a/modules/startup-wizard/Makefile.am +++ b/modules/startup-wizard/Makefile.am @@ -19,6 +19,8 @@ libevolution_module_startup_wizard_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/capplet/settings/libevolution-mail-settings.la \ + $(top_builddir)/libemail-engine/libemail-engine.la \ + $(top_builddir)/libemail-utils/libemail-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index de15b72609..2edeb1cc78 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -24,13 +24,17 @@ #include #include -#include + #include #include +#include + #include #include + #include + #include /* Standard GObject macros */ -- cgit v1.2.3