aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-folder-tree-model.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2011-10-22 01:26:07 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-10-25 00:03:54 +0800
commit56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6 (patch)
tree9d042f76db5acba2aaaed47b41c581a06a204883 /mail/em-folder-tree-model.c
parent8c67e84f9bf1803108f7a004513e37c6ef22d41f (diff)
downloadgsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.tar
gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.tar.gz
gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.tar.bz2
gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.tar.lz
gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.tar.xz
gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.tar.zst
gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.zip
Adapt to CamelNetworkSettings changes.
Diffstat (limited to 'mail/em-folder-tree-model.c')
-rw-r--r--mail/em-folder-tree-model.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 1e7840710f..0d305799fb 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -1218,7 +1218,6 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model,
service = CAMEL_SERVICE (store);
provider = camel_service_get_provider (service);
- service_url = camel_service_get_camel_url (service);
display_name = camel_service_get_display_name (service);
account_uid = camel_service_get_uid (service);
@@ -1230,15 +1229,18 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model,
if ((provider->flags & CAMEL_PROVIDER_IS_STORAGE) == 0)
return;
- if (em_utils_is_local_delivery_mbox_file (service_url))
+ service_url = camel_service_new_camel_url (service);
+ if (em_utils_is_local_delivery_mbox_file (service_url)) {
+ camel_url_free (service_url);
return;
+ }
+ uri = camel_url_to_string (service_url, CAMEL_URL_HIDE_ALL);
+ camel_url_free (service_url);
si = em_folder_tree_model_lookup_store_info (model, store);
if (si != NULL)
em_folder_tree_model_remove_store (model, store);
- uri = camel_url_to_string (service_url, CAMEL_URL_HIDE_ALL);
-
mail_backend = em_folder_tree_model_get_backend (model);
/* Add the store to the tree. */