diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-06-25 00:59:33 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-25 06:29:22 +0800 |
commit | f0d3f3afdfa314e1e8cd7d8da790878008a46aad (patch) | |
tree | 7116e2a18c7bd50633b2f8de42b5377af1e8172a /mail/mail-mt.c | |
parent | 94302ea73cde0b470faad653f752406f19f202d7 (diff) | |
download | gsoc2013-evolution-f0d3f3afdfa314e1e8cd7d8da790878008a46aad.tar gsoc2013-evolution-f0d3f3afdfa314e1e8cd7d8da790878008a46aad.tar.gz gsoc2013-evolution-f0d3f3afdfa314e1e8cd7d8da790878008a46aad.tar.bz2 gsoc2013-evolution-f0d3f3afdfa314e1e8cd7d8da790878008a46aad.tar.lz gsoc2013-evolution-f0d3f3afdfa314e1e8cd7d8da790878008a46aad.tar.xz gsoc2013-evolution-f0d3f3afdfa314e1e8cd7d8da790878008a46aad.tar.zst gsoc2013-evolution-f0d3f3afdfa314e1e8cd7d8da790878008a46aad.zip |
Radically reorganize source code.
- Collect all shell modules into a new top-level 'modules' directory:
$(top_srcdir)/modules/addressbook
$(top_srcdir)/modules/calendar
$(top_srcdir)/modules/mail
Nothing is allowed to link to these, not plugins nor other modules.
THIS SOLVES BUG #571275 AND OPENS THE DOOR TO PORTING TO MAC OS X.
- Mimic the libevolution-mail-shared library from master (except drop
the "shared" suffix) and have libevolution-mail-importers and all
mail-related plugins link to it.
- Discard the a11y subdirectories and have the files live alongside
their counterpart widgets.
Diffstat (limited to 'mail/mail-mt.c')
-rw-r--r-- | mail/mail-mt.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mail/mail-mt.c b/mail/mail-mt.c index ade31e56b9..c5b6edaa14 100644 --- a/mail/mail-mt.c +++ b/mail/mail-mt.c @@ -34,6 +34,7 @@ #include <camel/camel-url.h> #include <camel/camel-operation.h> +#include "shell/e-shell.h" #include "misc/e-gui-utils.h" #include "e-util/e-error.h" #include "e-util/e-icon-factory.h" @@ -43,8 +44,6 @@ #include "mail-session.h" #include "mail-mt.h" -#include "e-mail-shell-backend.h" - /*#define MALLOC_CHECK*/ #define LOG_OPS #define LOG_LOCKS @@ -142,9 +141,11 @@ mail_msg_new (MailMsgInfo *info) static void end_event_callback (CamelObject *o, EActivity *activity, gpointer error) { + EShell *shell; EShellBackend *shell_backend; - shell_backend = E_SHELL_BACKEND (global_mail_shell_backend); + shell = e_shell_get_default (); + shell_backend = e_shell_get_backend_by_name (shell, "mail"); if (error == NULL) { e_activity_complete (activity); @@ -941,6 +942,7 @@ struct _op_status_msg { static void op_status_exec (struct _op_status_msg *m) { + EShell *shell; EShellBackend *shell_backend; MailMsg *msg; MailMsgPrivate *data; @@ -949,7 +951,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); + shell = e_shell_get_default (); + shell_backend = e_shell_get_backend_by_name (shell, "mail"); MAIL_MT_LOCK (mail_msg_lock); |