aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
Diffstat (limited to 'modules/mail')
-rw-r--r--modules/mail/e-mail-shell-backend.c4
-rw-r--r--modules/mail/e-mail-shell-view-private.h2
-rw-r--r--modules/mail/em-account-prefs.c6
3 files changed, 7 insertions, 5 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 79832ab499..25902f34df 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -54,7 +54,7 @@
#include <mail/em-format-html-display.h>
#include <mail/em-utils.h>
#include <mail/mail-send-recv.h>
-#include <mail/mail-vfolder.h>
+#include <mail/mail-vfolder-ui.h>
#include <mail/importers/mail-importer.h>
#include <mail/e-mail-ui-session.h>
@@ -518,7 +518,7 @@ mail_shell_backend_start (EShellBackend *shell_backend)
enable_search_folders = e_shell_settings_get_boolean (
shell_settings, "mail-enable-search-folders");
if (enable_search_folders)
- vfolder_load_storage (backend);
+ vfolder_load_storage (session);
if (!e_mail_account_store_load_sort_order (account_store, &error)) {
g_warning ("%s: %s", G_STRFUNC, error->message);
diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h
index c60d5c699e..2a884f4540 100644
--- a/modules/mail/e-mail-shell-view-private.h
+++ b/modules/mail/e-mail-shell-view-private.h
@@ -63,7 +63,7 @@
#include <mail/em-utils.h>
#include <mail/mail-autofilter.h>
#include <mail/mail-send-recv.h>
-#include <mail/mail-vfolder.h>
+#include <mail/mail-vfolder-ui.h>
#include <mail/message-list.h>
#include "e-mail-shell-backend.h"
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index 18fed16a60..1e492bebd6 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -47,7 +47,7 @@
#include <mail/em-config.h>
#include <mail/em-account-editor.h>
#include <mail/em-utils.h>
-#include <mail/mail-vfolder.h>
+#include <mail/mail-vfolder-ui.h>
#define EM_ACCOUNT_PREFS_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
@@ -78,14 +78,16 @@ account_prefs_service_enabled_cb (EMailAccountStore *store,
{
EMailBackend *backend;
const gchar *uid;
+ EMailSession *session;
uid = camel_service_get_uid (service);
backend = em_account_prefs_get_backend (prefs);
+ session = e_mail_backend_get_session (backend);
/* FIXME Kind of a gross hack. EMailSession doesn't have
* access to EMailBackend so it can't do this itself. */
if (g_strcmp0 (uid, E_MAIL_SESSION_VFOLDER_UID) == 0)
- vfolder_load_storage (backend);
+ vfolder_load_storage (session);
}
static void