aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2011-06-02 05:30:23 +0800
committerRodrigo Moya <rodrigo@gnome-db.org>2011-06-30 00:42:22 +0800
commit8600672a9112a22c5fcd9243c5de709bfa9d5c4d (patch)
tree3a28213b8e91cd01c9b02576edcda555f7701c4e
parentde29fdc57258c162f37d0862469362f859e32c47 (diff)
downloadgsoc2013-evolution-8600672a9112a22c5fcd9243c5de709bfa9d5c4d.tar
gsoc2013-evolution-8600672a9112a22c5fcd9243c5de709bfa9d5c4d.tar.gz
gsoc2013-evolution-8600672a9112a22c5fcd9243c5de709bfa9d5c4d.tar.bz2
gsoc2013-evolution-8600672a9112a22c5fcd9243c5de709bfa9d5c4d.tar.lz
gsoc2013-evolution-8600672a9112a22c5fcd9243c5de709bfa9d5c4d.tar.xz
gsoc2013-evolution-8600672a9112a22c5fcd9243c5de709bfa9d5c4d.tar.zst
gsoc2013-evolution-8600672a9112a22c5fcd9243c5de709bfa9d5c4d.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.
-rw-r--r--mail/em-folder-tree-model.c3
-rw-r--r--mail/em-folder-tree.c6
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. */