[evolution] I#324 - Mail account auto-config port overwritten with encryption change
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] I#324 - Mail account auto-config port overwritten with encryption change
- Date: Mon, 4 Mar 2019 09:44:34 +0000 (UTC)
commit 7a46b3a24aa32b8bb77e1f31aa51547e5a6e5f09
Author: Milan Crha <mcrha redhat com>
Date: Mon Mar 4 10:45:13 2019 +0100
I#324 - Mail account auto-config port overwritten with encryption change
Closes https://gitlab.gnome.org/GNOME/evolution/issues/324
src/mail/e-mail-autoconfig.c | 6 ++++--
src/modules/config-lookup/e-srv-config-lookup.c | 10 ++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/src/mail/e-mail-autoconfig.c b/src/mail/e-mail-autoconfig.c
index 83ee064a1d..ea27ed7db5 100644
--- a/src/mail/e-mail-autoconfig.c
+++ b/src/mail/e-mail-autoconfig.c
@@ -574,12 +574,14 @@ mail_autoconfig_set_details (ESourceRegistry *registry,
settings = e_source_camel_get_settings (camel_ext);
g_return_val_if_fail (CAMEL_IS_NETWORK_SETTINGS (settings), FALSE);
+ /* Set the security method before the port, to not have it overwritten
+ in New Mail Account wizard (binding callback). */
g_object_set (settings,
+ "auth-mechanism", result->auth_mechanism,
+ "security-method", result->security_method,
"user", result->user,
"host", result->host,
"port", result->port,
- "auth-mechanism", result->auth_mechanism,
- "security-method", result->security_method,
NULL);
if (result->host && registry) {
diff --git a/src/modules/config-lookup/e-srv-config-lookup.c b/src/modules/config-lookup/e-srv-config-lookup.c
index 6e49292274..ae6e832fae 100644
--- a/src/modules/config-lookup/e-srv-config-lookup.c
+++ b/src/modules/config-lookup/e-srv-config-lookup.c
@@ -155,10 +155,6 @@ srv_config_lookup_domain_sync (EConfigLookup *config_lookup,
extension_name = e_source_camel_get_extension_name
(known_services[ii].evo_protocol);
- e_config_lookup_result_simple_add_string (lookup_result,
extension_name, "host", hostname);
- e_config_lookup_result_simple_add_uint (lookup_result,
extension_name, "port", g_srv_target_get_port (target));
- e_config_lookup_result_simple_add_string (lookup_result,
extension_name, "user", email_address);
-
if (g_str_has_suffix (known_services[ii].gio_protocol, "s"))
security_method =
CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
else
@@ -180,6 +176,12 @@ srv_config_lookup_domain_sync (EConfigLookup *config_lookup,
e_config_lookup_result_simple_add_string (lookup_result,
E_SOURCE_EXTENSION_AUTHENTICATION,
"method", "PLAIN");
}
+
+ /* Set the security method before the port, to not have it overwritten
+ in New Mail Account wizard (binding callback). */
+ e_config_lookup_result_simple_add_string (lookup_result,
extension_name, "host", hostname);
+ e_config_lookup_result_simple_add_uint (lookup_result,
extension_name, "port", g_srv_target_get_port (target));
+ e_config_lookup_result_simple_add_string (lookup_result,
extension_name, "user", email_address);
} else if (known_services[ii].kind == E_CONFIG_LOOKUP_RESULT_COLLECTION) {
gboolean is_calendar = g_str_equal (known_services[ii].evo_protocol,
"caldav");
gchar *url;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]