aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-01-08 03:52:07 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:41:16 +0800
commitc5265294a3999b134e6f4d7d93b03001312cd075 (patch)
treecd230a50fe70324407d7e437e0b6918aa7968e70 /modules
parent10a835d5e6e7a259d3ba68c43a13c28d619f8780 (diff)
downloadgsoc2013-evolution-c5265294a3999b134e6f4d7d93b03001312cd075.tar
gsoc2013-evolution-c5265294a3999b134e6f4d7d93b03001312cd075.tar.gz
gsoc2013-evolution-c5265294a3999b134e6f4d7d93b03001312cd075.tar.bz2
gsoc2013-evolution-c5265294a3999b134e6f4d7d93b03001312cd075.tar.lz
gsoc2013-evolution-c5265294a3999b134e6f4d7d93b03001312cd075.tar.xz
gsoc2013-evolution-c5265294a3999b134e6f4d7d93b03001312cd075.tar.zst
gsoc2013-evolution-c5265294a3999b134e6f4d7d93b03001312cd075.zip
Avoid idle callbacks in EMailBackend initialization.
If the migration phase has to show a dialog the idle callback for intializing mail stores will run too soon. Instead, hook it onto the EShellBackend start() method. Migration code can initialize mail stores early if it needs to.
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/e-mail-shell-backend.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 590241a838..c7bba4944a 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -514,7 +514,9 @@ mail_shell_backend_start (EShellBackend *shell_backend)
EShell *shell;
EShellSettings *shell_settings;
EMailBackend *backend;
+ EMailSession *session;
gboolean enable_search_folders;
+ const gchar *data_dir;
priv = E_MAIL_SHELL_BACKEND_GET_PRIVATE (shell_backend);
@@ -522,6 +524,10 @@ mail_shell_backend_start (EShellBackend *shell_backend)
shell_settings = e_shell_get_shell_settings (shell);
backend = E_MAIL_BACKEND (shell_backend);
+ session = e_mail_backend_get_session (backend);
+ data_dir = e_shell_backend_get_data_dir (shell_backend);
+
+ e_mail_store_init (session, data_dir);
enable_search_folders = e_shell_settings_get_boolean (
shell_settings, "mail-enable-search-folders");