From c5265294a3999b134e6f4d7d93b03001312cd075 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Jan 2011 14:52:07 -0500 Subject: 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. --- modules/mail/e-mail-shell-backend.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules') 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"); -- cgit v1.2.3