[evolution/webkit] Bug #632293 - Do not add POP accounts into folder tree

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

commit 46b127f16732ce6500f714ecd059e373f64ce312
Author: Milan Crha <mcrha redhat com>
Date:   Wed Nov 10 11:40:43 2010 +0100

    Bug #632293 - Do not add POP accounts into folder tree

 mail/e-mail-store.c         |    3 +++
 mail/em-folder-tree-model.c |    4 +++-
 2 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index fdba2cf..44c5c7e 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -171,6 +171,9 @@ mail_store_add (EMailSession *session,
 	StoreInfo *store_info;
 
 	g_return_if_fail (store_table != NULL);
+	g_return_if_fail (store != NULL);
+	g_return_if_fail (CAMEL_IS_STORE (store));
+	g_return_if_fail ((CAMEL_SERVICE (store)->provider->flags & CAMEL_PROVIDER_IS_STORAGE) != 0);
 
 	default_model = em_folder_tree_model_get_default ();
 	folder_cache = e_mail_session_get_folder_cache (session);
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index f1f69a7..f29a5fe 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -269,7 +269,9 @@ account_added_cb (EAccountList *accounts,
 		CAMEL_SESSION (session), uri, CAMEL_PROVIDER_STORE, NULL);
 
 	if (store != NULL) {
-		e_mail_store_add (session, store, account->name);
+		if ((CAMEL_SERVICE (store)->provider->flags & CAMEL_PROVIDER_IS_STORAGE) != 0)
+			e_mail_store_add (session, store, account->name);
+
 		g_object_unref (store);
 	}
 }