diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-folder-tree-model.c | 7 | ||||
| -rw-r--r-- | mail/mail-send-recv.c | 8 |
2 files changed, 4 insertions, 11 deletions
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c index d25d9d7a1f..0853b640d1 100644 --- a/mail/em-folder-tree-model.c +++ b/mail/em-folder-tree-model.c @@ -1563,11 +1563,10 @@ em_folder_tree_model_add_store (EMFolderTreeModel *model, if ((provider->flags & CAMEL_PROVIDER_IS_STORAGE) == 0) return; - service_url = camel_service_new_camel_url (service); - if (em_utils_is_local_delivery_mbox_file (service_url)) { - camel_url_free (service_url); + if (em_utils_is_local_delivery_mbox_file (service)) return; - } + + service_url = camel_service_new_camel_url (service); uri = camel_url_to_string (service_url, CAMEL_URL_HIDE_ALL); camel_url_free (service_url); diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index dbdf629110..1a89a3b4b4 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -432,22 +432,16 @@ format_service_name (CamelService *service) static send_info_t get_receive_type (CamelService *service) { - CamelURL *url; CamelProvider *provider; const gchar *uid; - gboolean is_local_delivery; /* Disregard CamelNullStores. */ if (CAMEL_IS_NULL_STORE (service)) return SEND_INVALID; - url = camel_service_new_camel_url (service); - is_local_delivery = em_utils_is_local_delivery_mbox_file (url); - camel_url_free (url); - /* mbox pointing to a file is a 'Local delivery' * source which requires special processing. */ - if (is_local_delivery) + if (em_utils_is_local_delivery_mbox_file (service)) return SEND_RECEIVE; provider = camel_service_get_provider (service); |