From ea8d9ff8f57c331b13afbea59160540f21fdca28 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 1 Nov 2011 11:03:15 +0100 Subject: Bug #627952 - 'Local delivery' mbox's aren't read properly --- mail/em-account-editor.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'mail') diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 86228b7182..87ff312fe1 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2162,12 +2162,10 @@ emae_setup_service (EMAccountEditor *emae, EAccount *account; struct _service_info *info = &emae_service_info[service->type]; CamelURL *url = emae_account_url (emae, info->account_uri_key); - const gchar *uri; account = em_account_editor_get_modified_account (emae); - uri = e_account_get_string (account, info->account_uri_key); - service->provider = uri ? camel_provider_get (uri, NULL) : NULL; + service->provider = url && url->protocol ? camel_provider_get (url->protocol, NULL) : NULL; /* Extract all widgets we need from the builder file. */ @@ -4072,9 +4070,21 @@ emae_commit (EConfig *ec, url = camel_url_new (modified_account->source->url, NULL); if (url != NULL) { - if (emae->priv->source.settings != NULL) + if (emae->priv->source.settings != NULL) { + gchar *host = g_strdup (url->host); + gchar *path = g_strdup (url->path); + gint port = url->port; + camel_settings_save_to_url ( emae->priv->source.settings, url); + + camel_url_set_host (url, host); + camel_url_set_path (url, path); + camel_url_set_port (url, port); + + g_free (host); + g_free (path); + } g_free (modified_account->source->url); modified_account->source->url = camel_url_to_string (url, 0); camel_url_free (url); @@ -4082,9 +4092,20 @@ emae_commit (EConfig *ec, url = camel_url_new (modified_account->transport->url, NULL); if (url != NULL) { - if (emae->priv->transport.settings != NULL) + if (emae->priv->transport.settings != NULL) { + gchar *host = g_strdup (url->host); + gchar *path = g_strdup (url->path); + gint port = url->port; + camel_settings_save_to_url ( emae->priv->transport.settings, url); + camel_url_set_host (url, host); + camel_url_set_path (url, path); + camel_url_set_port (url, port); + + g_free (host); + g_free (path); + } g_free (modified_account->transport->url); modified_account->transport->url = camel_url_to_string (url, 0); camel_url_free (url); -- cgit