diff options
| author | Milan Crha <mcrha@redhat.com> | 2011-06-02 05:30:23 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2011-06-02 05:30:23 +0800 |
| commit | 0c3aa866257c2c8f48ac38055aee7c602c2f9e48 (patch) | |
| tree | 4865b1a473e1a18d4d8dffbc84d38c5d97565f04 /mail | |
| parent | 3053c319827b02d8f6079f68a64b9a018ce41fe5 (diff) | |
| download | gsoc2013-evolution-0c3aa866257c2c8f48ac38055aee7c602c2f9e48.tar.gz gsoc2013-evolution-0c3aa866257c2c8f48ac38055aee7c602c2f9e48.tar.zst gsoc2013-evolution-0c3aa866257c2c8f48ac38055aee7c602c2f9e48.zip | |
Do not add 'Local delivery' accounts into folder tree
And make folder_tree_get_folder_info_cb() always finish properly,
because evolution doesn't want to quit otherwise.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-folder-tree-model.c | 3 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index 79955504d6..16acd183a1 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -221,7 +221,8 @@ account_changed_cb (EAccountList *accounts, /* make sure the new store belongs in the tree */ provider = camel_service_get_provider (service); - if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE)) + if (!(provider->flags & CAMEL_PROVIDER_IS_STORAGE) || + em_utils_is_local_delivery_mbox_file (camel_service_get_camel_url (service))) return; em_folder_tree_model_add_store ( diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index bf5958a5c3..d740e265a4 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -279,6 +279,12 @@ folder_tree_get_folder_info_cb (CamelStore *store, return; } + if (!folder_info) { + g_warn_if_fail (folder_info != NULL); + async_context_free (context); + return; + } + g_return_if_fail (folder_info != NULL); /* Check if the store has been removed. */ |