diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-05-08 04:38:32 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-05-08 04:38:32 +0800 |
| commit | 16e2beab9e4d412399f495f6165d27da80cb3675 (patch) | |
| tree | 61946c02feb6e8187ef5368a9ddbcf15770cfe06 /mail/mail-session.c | |
| parent | 84080821d62db3358fcaee4adfc24782ed7d4318 (diff) | |
| download | gsoc2013-evolution-16e2beab9e4d412399f495f6165d27da80cb3675.tar gsoc2013-evolution-16e2beab9e4d412399f495f6165d27da80cb3675.tar.gz gsoc2013-evolution-16e2beab9e4d412399f495f6165d27da80cb3675.tar.bz2 gsoc2013-evolution-16e2beab9e4d412399f495f6165d27da80cb3675.tar.lz gsoc2013-evolution-16e2beab9e4d412399f495f6165d27da80cb3675.tar.xz gsoc2013-evolution-16e2beab9e4d412399f495f6165d27da80cb3675.tar.zst gsoc2013-evolution-16e2beab9e4d412399f495f6165d27da80cb3675.zip | |
Adapt mail to EShellBackend changes.
Again, builds but not tested. Lots of compiler warnings to clean up,
but I don't have the energy for it. This was pretty grueling.
Diffstat (limited to 'mail/mail-session.c')
| -rw-r--r-- | mail/mail-session.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mail/mail-session.c b/mail/mail-session.c index df5d35c179..5cb61e9f71 100644 --- a/mail/mail-session.c +++ b/mail/mail-session.c @@ -83,7 +83,7 @@ typedef struct _MailSessionClass { } MailSessionClass; -static EShellModule *mail_shell_module; +static EMailShellBackend *session_mail_shell_backend; static CamelSessionClass *ms_parent_class; static char *get_password(CamelSession *session, CamelService *service, const char *domain, const char *prompt, const char *item, guint32 flags, CamelException *ex); @@ -512,7 +512,7 @@ main_get_filter_driver (CamelSession *session, const char *type, CamelException gconf = mail_config_get_gconf_client (); - data_dir = e_shell_module_get_data_dir (mail_shell_module); + data_dir = e_shell_backend_get_data_dir (session_mail_shell_backend); user = g_build_filename (data_dir, "filters.xml", NULL); system = g_build_filename (EVOLUTION_PRIVDATADIR, "filtertypes.xml", NULL); fc = (RuleContext *) em_filter_context_new (); @@ -706,16 +706,18 @@ mail_session_check_junk_notify (GConfClient *gconf, guint id, GConfEntry *entry, } void -mail_session_init (EShellModule *shell_module) +mail_session_init (EMailShellBackend *mail_shell_backend) { EShell *shell; + EShellBackend *shell_backend; GConfClient *gconf; gboolean online; const gchar *data_dir; - mail_shell_module = shell_module; + session_mail_shell_backend = mail_shell_backend; - shell = e_shell_module_get_shell (shell_module); + shell_backend = E_SHELL_BACKEND (mail_shell_backend); + shell = e_shell_backend_get_shell (shell_backend); online = e_shell_get_online (shell); data_dir = e_get_user_data_dir (); @@ -728,7 +730,7 @@ mail_session_init (EShellModule *shell_module) e_account_combo_box_set_session (session); /* XXX Don't ask... */ e_account_writable(NULL, E_ACCOUNT_SOURCE_SAVE_PASSWD); /* Init the EAccount Setup */ - data_dir = e_shell_module_get_data_dir (shell_module); + data_dir = e_shell_backend_get_data_dir (shell_backend); camel_session_construct (session, data_dir); gconf = mail_config_get_gconf_client (); |