aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail/e-mail-shell-settings.c
diff options
context:
space:
mode:
Diffstat (limited to 'modules/mail/e-mail-shell-settings.c')
-rw-r--r--modules/mail/e-mail-shell-settings.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 690a0ef5b8..5452a1939a 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -24,18 +24,28 @@
#include <gconf/gconf-client.h>
#include <libedataserver/e-account-list.h>
-#include "e-util/e-signature-list.h"
-#include "mail/e-mail-label-list-store.h"
-#include "mail/mail-session.h"
+#include <e-util/e-signature-list.h>
+
+#include <mail/e-mail-backend.h>
+#include <mail/e-mail-label-list-store.h>
+
+#include <shell/e-shell.h>
void
-e_mail_shell_settings_init (EShell *shell)
+e_mail_shell_settings_init (EShellBackend *shell_backend)
{
+ EShell *shell;
EShellSettings *shell_settings;
+ EMailBackend *backend;
+ EMailSession *session;
gpointer object;
+ shell = e_shell_backend_get_shell (shell_backend);
shell_settings = e_shell_get_shell_settings (shell);
+ backend = E_MAIL_BACKEND (shell_backend);
+ session = e_mail_backend_get_session (backend);
+
/*** Global Objects ***/
e_shell_settings_install_property (
@@ -58,9 +68,9 @@ e_mail_shell_settings_init (EShell *shell)
NULL,
G_PARAM_READWRITE));
- g_object_ref (session);
e_shell_settings_set_pointer (
- shell_settings, "mail-session", session);
+ shell_settings, "mail-session",
+ g_object_ref (session));
/*** Mail Preferences ***/