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-mt.c | |
| parent | 84080821d62db3358fcaee4adfc24782ed7d4318 (diff) | |
| download | gsoc2013-evolution-16e2beab9e4d412399f495f6165d27da80cb3675.tar.gz 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-mt.c')
| -rw-r--r-- | mail/mail-mt.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/mail/mail-mt.c b/mail/mail-mt.c index 566d5ecd6f..dbdfe3b690 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -43,7 +43,7 @@ #include "mail-session.h" #include "mail-mt.h" -#include "e-mail-shell-module.h" +#include "e-mail-shell-backend.h" /*#define MALLOC_CHECK*/ #define LOG_OPS @@ -142,6 +142,10 @@ mail_msg_new (MailMsgInfo *info) static void end_event_callback (CamelObject *o, EActivity *activity, void *error) { + EShellBackend *shell_backend; + + shell_backend = E_SHELL_BACKEND (global_mail_shell_backend); + if (error == NULL) { e_activity_complete (activity); g_object_unref (activity); @@ -149,7 +153,7 @@ end_event_callback (CamelObject *o, EActivity *activity, void *error) if (activity != NULL) g_object_unref (activity); activity = e_alert_activity_new_warning (error); - e_shell_module_add_activity (mail_shell_module, activity); + e_shell_backend_add_activity (shell_backend, activity); g_object_unref (activity); } } @@ -937,6 +941,7 @@ struct _op_status_msg { static void op_status_exec (struct _op_status_msg *m) { + EShellBackend *shell_backend; MailMsg *msg; MailMsgPrivate *data; char *out, *p, *o, c; @@ -944,6 +949,8 @@ op_status_exec (struct _op_status_msg *m) g_return_if_fail (mail_in_main_thread ()); + shell_backend = E_SHELL_BACKEND (global_mail_shell_backend); + MAIL_MT_LOCK (mail_msg_lock); msg = g_hash_table_lookup (mail_msg_active_table, m->data); @@ -990,7 +997,7 @@ op_status_exec (struct _op_status_msg *m) data->activity = e_activity_new (what); e_activity_set_allow_cancel (data->activity, TRUE); e_activity_set_percent (data->activity, 0.0); - e_shell_module_add_activity (mail_shell_module, data->activity); + e_shell_backend_add_activity (shell_backend, data->activity); g_signal_connect_swapped ( data->activity, "cancelled", |