diff options
| author | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-18 05:38:50 +0800 |
|---|---|---|
| committer | Jonathon Jongsma <jonathon@quotidian.org> | 2009-12-21 23:45:27 +0800 |
| commit | ec626660cfc5e2869a02c621247a7e0b02508151 (patch) | |
| tree | fd7317c520daeaf78d0d81cbc3ba320f9d582684 | |
| parent | d153638ef6ea99b106fcb9f22c40496f3e75def5 (diff) | |
| download | gsoc2013-evolution-ec626660cfc5e2869a02c621247a7e0b02508151.tar.gz gsoc2013-evolution-ec626660cfc5e2869a02c621247a7e0b02508151.tar.zst gsoc2013-evolution-ec626660cfc5e2869a02c621247a7e0b02508151.zip | |
The shell backend is responsibile for setting the MailSession online
Previously the mail session set itself online inside mail_session_init() by
checking whether the shell was online. This removes one more dependency from
MailSession to EShell by moving that responsibility up one level.
https://bugzilla.gnome.org/show_bug.cgi?id=604952
| -rw-r--r-- | mail/e-mail-backend.c | 2 | ||||
| -rw-r--r-- | mail/mail-session.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c index 30b691ef5c..dca721770e 100644 --- a/mail/e-mail-backend.c +++ b/mail/e-mail-backend.c @@ -387,6 +387,8 @@ mail_backend_constructed (GObject *object) /* This also initializes Camel, so it needs to happen early. */ mail_session_init (shell_backend); + + camel_session_set_online ((CamelSession *) session, e_shell_get_online (shell)); e_account_combo_box_set_session (session); /* XXX Don't ask... */ folder_cache = mail_folder_cache_get_default (); diff --git a/mail/mail-session.c b/mail/mail-session.c index dc7e40d79a..c7e86da926 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -798,12 +798,7 @@ mail_session_check_junk_notify (GConfClient *gconf, guint id, GConfEntry *entry, void mail_session_init (EShellBackend *shell_backend) { - EShell *shell; GConfClient *gconf; - gboolean online; - - shell = e_shell_backend_get_shell (shell_backend); - online = e_shell_get_online (shell); if (camel_init (e_get_user_data_dir (), TRUE) != 0) exit (0); @@ -826,7 +821,6 @@ mail_session_init (EShellBackend *shell_backend) session, NULL, NULL); session->junk_plugin = NULL; - camel_session_set_online ((CamelSession *) session, online); mail_config_reload_junk_headers (); } |