aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/e-mail-store.c6
-rw-r--r--mail/em-folder-tree.c2
-rw-r--r--mail/mail-send-recv.c2
3 files changed, 2 insertions, 8 deletions
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index 1e4155bf6e..46f02705fc 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -248,12 +248,6 @@ mail_store_load_accounts (EMailSession *session,
if (uri == NULL || *uri == '\0')
continue;
- /* HACK: mbox URI's are handled by the local store setup
- * above. Any that come through as account sources
- * are really movemail sources! */
- if (g_str_has_prefix (uri, "maildir:"))
- continue;
-
e_mail_store_add_by_uri (session, uri, display_name);
}
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 97de630776..62590689bb 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -3279,7 +3279,7 @@ em_folder_tree_restore_state (EMFolderTree *folder_tree,
/* Do not expand local stores in Express mode. */
if (e_shell_get_express_mode (shell)) {
expand_row &= (strncmp (uri, "vfolder", 7) != 0);
- expand_row &= (strncmp (uri, "maildir", 4) != 0);
+ expand_row &= (strncmp (uri, "maildir", 7) != 0);
}
if (expand_row) {
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index fa0b9d2ec7..1736d7b7aa 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -384,7 +384,7 @@ get_receive_type (const gchar *url)
/* HACK: since mbox is ALSO used for native evolution trees now, we need to
fudge this to treat it as a special 'movemail' source */
- if (!strncmp(url, "maildir:", 5))
+ if (!strncmp(url, "maildir:", 8))
return SEND_RECEIVE;
provider = camel_provider_get (url, NULL);