aboutsummaryrefslogtreecommitdiffstats
path: root/mail/importers/mail-importer.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-05-08 04:38:32 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-05-08 04:38:32 +0800
commit16e2beab9e4d412399f495f6165d27da80cb3675 (patch)
tree61946c02feb6e8187ef5368a9ddbcf15770cfe06 /mail/importers/mail-importer.c
parent84080821d62db3358fcaee4adfc24782ed7d4318 (diff)
downloadgsoc2013-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/importers/mail-importer.c')
-rw-r--r--mail/importers/mail-importer.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index fde63dfdae..dbae51dfcb 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -36,7 +36,6 @@
#include <glib.h>
#include <glib/gstdio.h>
-#include <gmodule.h>
#include <glib/gi18n.h>
#include <camel/camel-folder.h>
#include <camel/camel-store.h>
@@ -49,7 +48,7 @@
#include "mail/mail-mt.h"
#include "mail/mail-tools.h"
-#include "mail/e-mail-shell-module.h"
+#include "mail/e-mail-shell-backend.h"
#include "mail-importer.h"
@@ -203,8 +202,8 @@ import_mbox_exec (struct _import_mbox_msg *m)
}
if (m->uri == NULL || m->uri[0] == 0)
- folder = e_mail_shell_module_get_folder (
- mail_shell_module, E_MAIL_FOLDER_INBOX);
+ folder = e_mail_shell_backend_get_folder (
+ global_mail_shell_backend, E_MAIL_FOLDER_INBOX);
else
folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex);
@@ -369,7 +368,7 @@ import_folders_rec(struct _import_folders_data *m, const char *filepath, const c
if (dir == NULL)
return;
- data_dir = e_shell_module_get_data_dir (mail_shell_module);
+ data_dir = e_shell_backend_get_data_dir (global_mail_shell_backend);
utf8_filename = g_filename_to_utf8 (filepath, -1, NULL, NULL, NULL);
camel_operation_start(NULL, _("Scanning %s"), utf8_filename);