From a06e4484b8df804124b5bcf88d94dec5acfba270 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 6 Oct 2010 23:38:52 -0400 Subject: Give MailSession a permanent home. Global variables in shared libraries are a bad idea. EMailBackend now owns the MailSession instance, which is actually now EMailSession. Move the blocking utility functions in mail-tools.c to e-mail-session.c and add asynchronous variants. Same approach as Camel. Replace EMailReader.get_shell_backend() with EMailReader.get_backend(), which returns an EMailBackend. Easier access to the EMailSession. --- modules/startup-wizard/evolution-startup-wizard.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'modules/startup-wizard') diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c index e1b8551574..6f07d6856e 100644 --- a/modules/startup-wizard/evolution-startup-wizard.c +++ b/modules/startup-wizard/evolution-startup-wizard.c @@ -25,6 +25,7 @@ #include #include +#include #include #include #include @@ -424,14 +425,24 @@ startup_wizard_progress_page (EConfig *config, static GtkWidget * startup_wizard_new_assistant (EStartupWizard *extension) { + EShell *shell; + EShellBackend *shell_backend; + EMailBackend *backend; + EMailSession *session; EMAccountEditor *emae; EConfig *config; EConfigItem *config_item; GtkWidget *widget; GSList *items = NULL; + shell = startup_wizard_get_shell (extension); + shell_backend = e_shell_get_backend_by_name (shell, "mail"); + + backend = E_MAIL_BACKEND (shell_backend); + session = e_mail_backend_get_session (backend); + emae = em_account_editor_new ( - NULL, EMAE_ASSISTANT, + NULL, EMAE_ASSISTANT, session, "org.gnome.evolution.mail.config.accountWizard"); config = E_CONFIG (emae->config); @@ -515,7 +526,7 @@ startup_wizard_run (EStartupWizard *extension) const gchar *startup_view; gboolean express_mode; - shell = e_shell_get_default (); + shell = startup_wizard_get_shell (extension); express_mode = e_shell_get_express_mode (shell); startup_view = e_shell_get_startup_view (shell); -- cgit v1.2.3