From f4d9a26f99304d0fed83289bb6411e3a14a01ef7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 12 Feb 2009 19:01:33 +0000 Subject: Make MailSession available through EShellSettings so composer can use it. svn path=/branches/kill-bonobo/; revision=37257 --- composer/e-msg-composer.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'composer/e-msg-composer.c') diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 0f91a34907..288a9c6868 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -3631,15 +3631,18 @@ e_msg_composer_new_redirect (CamelMimeMessage *message, CamelSession * e_msg_composer_get_session (EMsgComposer *composer) { - EShellModule *shell_module; - CamelSession *session; EShell *shell; + EShellSettings *shell_settings; + CamelSession *session; + + /* FIXME EMsgComposer should own a reference to EShell. */ g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), NULL); shell = e_shell_get_default (); - shell_module = e_shell_get_module_by_name (shell, "mail"); - session = g_object_get_data (G_OBJECT (shell_module), "session"); + shell_settings = e_shell_get_shell_settings (shell); + + session = e_shell_settings_get_pointer (shell_settings, "mail-session"); g_return_val_if_fail (CAMEL_IS_SESSION (session), NULL); return session; -- cgit