aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@gnome.org>2012-03-02 18:10:34 +0800
committerMatthew Barnes <mbarnes@redhat.com>2012-03-03 22:02:34 +0800
commit18593a0fb99e04854f66459972b2c53fca601cda (patch)
tree3ab1b17fa1b079e1cecc9ff0055bde40f55e588c /modules/mail
parentf2ae5f830dc506e084731111008a8e90c093e97e (diff)
downloadgsoc2013-evolution-18593a0fb99e04854f66459972b2c53fca601cda.tar
gsoc2013-evolution-18593a0fb99e04854f66459972b2c53fca601cda.tar.gz
gsoc2013-evolution-18593a0fb99e04854f66459972b2c53fca601cda.tar.bz2
gsoc2013-evolution-18593a0fb99e04854f66459972b2c53fca601cda.tar.lz
gsoc2013-evolution-18593a0fb99e04854f66459972b2c53fca601cda.tar.xz
gsoc2013-evolution-18593a0fb99e04854f66459972b2c53fca601cda.tar.zst
gsoc2013-evolution-18593a0fb99e04854f66459972b2c53fca601cda.zip
Move vfolders to libemail-engine and rest as mail-vfolder-ui. It all works and
the daemon can now start the vfolder storage without bothering much with the UI.
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