diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-10-22 01:26:07 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-10-25 00:03:54 +0800 |
| commit | 56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6 (patch) | |
| tree | 9d042f76db5acba2aaaed47b41c581a06a204883 /mail/mail-ops.c | |
| parent | 8c67e84f9bf1803108f7a004513e37c6ef22d41f (diff) | |
| download | gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.tar.gz gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.tar.zst gsoc2013-evolution-56ebfe2f3f1bbcd05c2ac78821edd06c986b40e6.zip | |
Adapt to CamelNetworkSettings changes.
Diffstat (limited to 'mail/mail-ops.c')
| -rw-r--r-- | mail/mail-ops.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 57885172a9..8bdb329f36 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -214,8 +214,8 @@ fetch_mail_exec (struct _fetch_mail_msg *m, struct _filter_mail_msg *fm = (struct _filter_mail_msg *) m; CamelFolder *folder = NULL; CamelURL *url; + gboolean is_local_delivery; const gchar *uid; - gboolean is_local_delivery = FALSE; gint i; fm->destination = e_mail_local_get_folder ( @@ -224,8 +224,9 @@ fetch_mail_exec (struct _fetch_mail_msg *m, goto fail; g_object_ref (fm->destination); - url = camel_service_get_camel_url (CAMEL_SERVICE (m->store)); + url = camel_service_new_camel_url (CAMEL_SERVICE (m->store)); is_local_delivery = em_utils_is_local_delivery_mbox_file (url); + if (is_local_delivery) { gchar *path; gchar *url_string; @@ -256,6 +257,8 @@ fetch_mail_exec (struct _fetch_mail_msg *m, fm->session, uid, cancellable, error); } + camel_url_free (url); + if (folder != NULL) { /* This handles 'keep on server' stuff, if we have any new * uid's to copy across, we need to copy them to a new array @@ -554,9 +557,10 @@ mail_send_message (struct _send_queue_msg *m, gchar *url_string; gchar *escaped; - url = camel_service_get_camel_url (CAMEL_SERVICE (transport)); + url = camel_service_new_camel_url (CAMEL_SERVICE (transport)); url_string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); escaped = escape_percent_sign (url_string); + camel_url_free (url); /* Let the dialog know the right account it is using. */ report_status (m, CAMEL_FILTER_STATUS_ACTION, 0, escaped); @@ -1199,8 +1203,9 @@ sync_store_desc (struct _sync_store_msg *m) CamelURL *url; gchar *uri, *res; - url = camel_service_get_camel_url (CAMEL_SERVICE (m->store)); + url = camel_service_new_camel_url (CAMEL_SERVICE (m->store)); uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); + camel_url_free (url); res = g_strdup_printf (m->expunge ?_("Expunging and storing account '%s'") |