diff options
Diffstat (limited to 'mail/importers')
| -rw-r--r-- | mail/importers/evolution-mbox-importer.c | 9 | ||||
| -rw-r--r-- | mail/importers/mail-importer.c | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c index 36cf8768ff..964741f28a 100644 --- a/mail/importers/evolution-mbox-importer.c +++ b/mail/importers/evolution-mbox-importer.c @@ -40,7 +40,7 @@ #include <camel/camel-exception.h> -#include "mail/e-mail-shell-module.h" +#include "mail/e-mail-shell-backend.h" #include "mail/em-folder-selection-button.h" #include "mail/mail-mt.h" @@ -75,9 +75,10 @@ mbox_getwidget(EImport *ei, EImportTarget *target, EImportImporter *im) EMFolderTreeModel *model; const gchar *local_inbox_folder_uri; - local_inbox_folder_uri = e_mail_shell_module_get_folder_uri ( - mail_shell_module, E_MAIL_FOLDER_INBOX); - model = e_mail_shell_module_get_folder_tree_model (mail_shell_module); + local_inbox_folder_uri = e_mail_shell_backend_get_folder_uri ( + global_mail_shell_backend, E_MAIL_FOLDER_INBOX); + model = e_mail_shell_backend_get_folder_tree_model ( + global_mail_shell_backend); hbox = gtk_hbox_new(FALSE, 0); 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); |