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

[Milan Crha <mcrha src gnome org>]

commit 06d134fb2d07221827bb926f2ae49455fb0d2365
Author: Milan Crha <mcrha redhat com>
Date:   Wed Nov 10 11:41:53 2010 +0100

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

 mail/e-mail-store.c         |    3 +++
 mail/em-folder-tree-model.c |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/mail/e-mail-store.c b/mail/e-mail-store.c
index 6fd0c7e..bc63e45 100644
--- a/mail/e-mail-store.c
+++ b/mail/e-mail-store.c
@@ -168,6 +168,9 @@ mail_store_add (CamelStore *store,
 	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 ();
 
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 82620f7..879f402 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -259,7 +259,8 @@ add_new_store (gchar *uri,
 	if (store == NULL)
 		return;
 
-	e_mail_store_add (store, account->name);
+	if ((CAMEL_SERVICE (store)->provider->flags & CAMEL_PROVIDER_IS_STORAGE) != 0)
+		e_mail_store_add (store, account->name);
 }
 
 static void