diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-11-10 18:40:43 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-11-10 18:40:43 +0800 |
| commit | 1d8d943f67a4e52d8c574e2598f0f2d7e03e488d (patch) | |
| tree | e1bbbcc8cdc5f765693b0125f8ed651996ce33ed | |
| parent | 80d11c3d35bfb9fa716fa08ff0259098066f225e (diff) | |
| download | gsoc2013-evolution-1d8d943f67a4e52d8c574e2598f0f2d7e03e488d.tar gsoc2013-evolution-1d8d943f67a4e52d8c574e2598f0f2d7e03e488d.tar.gz gsoc2013-evolution-1d8d943f67a4e52d8c574e2598f0f2d7e03e488d.tar.bz2 gsoc2013-evolution-1d8d943f67a4e52d8c574e2598f0f2d7e03e488d.tar.lz gsoc2013-evolution-1d8d943f67a4e52d8c574e2598f0f2d7e03e488d.tar.xz gsoc2013-evolution-1d8d943f67a4e52d8c574e2598f0f2d7e03e488d.tar.zst gsoc2013-evolution-1d8d943f67a4e52d8c574e2598f0f2d7e03e488d.zip | |
Bug #632293 - Do not add POP accounts into folder tree
| -rw-r--r-- | mail/e-mail-store.c | 3 | ||||
| -rw-r--r-- | 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 fdba2cfbd6..44c5c7e3a8 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 f1f69a7276..f29a5fe5d4 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); } } |