diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-11-10 18:40:43 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2010-11-16 17:43:15 +0800 |
| commit | a8e5e96228f138b89f6b1c682dd0c44fa1555019 (patch) | |
| tree | 8572e85849821d6af0d9a0db43d83b3a913f2504 | |
| parent | a0f84a5934124d37a1c176997eb3316850b16762 (diff) | |
| download | gsoc2013-evolution-a8e5e96228f138b89f6b1c682dd0c44fa1555019.tar gsoc2013-evolution-a8e5e96228f138b89f6b1c682dd0c44fa1555019.tar.gz gsoc2013-evolution-a8e5e96228f138b89f6b1c682dd0c44fa1555019.tar.bz2 gsoc2013-evolution-a8e5e96228f138b89f6b1c682dd0c44fa1555019.tar.lz gsoc2013-evolution-a8e5e96228f138b89f6b1c682dd0c44fa1555019.tar.xz gsoc2013-evolution-a8e5e96228f138b89f6b1c682dd0c44fa1555019.tar.zst gsoc2013-evolution-a8e5e96228f138b89f6b1c682dd0c44fa1555019.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); } } |