diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-01-12 23:38:06 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-01-12 23:38:06 +0800 |
| commit | 7ed120d34462ba1425782d1f0788863974f47cac (patch) | |
| tree | d583641373de28cf208970669a21d3355854c534 /mail | |
| parent | 88e2ead0df3a7b62c59a8ffb2d50cf1cf1b884bb (diff) | |
| download | gsoc2013-evolution-7ed120d34462ba1425782d1f0788863974f47cac.tar gsoc2013-evolution-7ed120d34462ba1425782d1f0788863974f47cac.tar.gz gsoc2013-evolution-7ed120d34462ba1425782d1f0788863974f47cac.tar.bz2 gsoc2013-evolution-7ed120d34462ba1425782d1f0788863974f47cac.tar.lz gsoc2013-evolution-7ed120d34462ba1425782d1f0788863974f47cac.tar.xz gsoc2013-evolution-7ed120d34462ba1425782d1f0788863974f47cac.tar.zst gsoc2013-evolution-7ed120d34462ba1425782d1f0788863974f47cac.zip | |
Do not hide maildir accounts from UI
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-store.c | 6 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 2 | ||||
| -rw-r--r-- | mail/mail-send-recv.c | 2 |
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); |