[evolution/webkit] Do not hide maildir accounts from UI

[Dan VrÃtil <dvratil src gnome org>]

commit 7db0afb0428e3e51d65f7c6090fb9d0f5c795c87
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 12 16:38:06 2011 +0100

    Do not hide maildir accounts from UI

 mail/e-mail-store.c   |    6 ------
 mail/em-folder-tree.c |    2 +-
 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 1e4155b..46f0270 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 97de630..6259068 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 fa0b9d2..1736d7b 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);