[evolution] ESrvConfigLookup: Use correct extension name for properties
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] ESrvConfigLookup: Use correct extension name for properties
- Date: Fri, 17 Sep 2021 10:13:39 +0000 (UTC)
commit 7733d88903efbec40be60a32b99acedc532ebe4d
Author: Milan Crha <mcrha redhat com>
Date: Fri Sep 17 12:10:18 2021 +0200
ESrvConfigLookup: Use correct extension name for properties
Regression after https://gitlab.gnome.org/GNOME/evolution/-/issues/324
causing runtime warnings like this one:
g_object_set_is_valid_property: object class 'ESourceMailAccount' has no property named 'user'
src/modules/config-lookup/e-srv-config-lookup.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/src/modules/config-lookup/e-srv-config-lookup.c b/src/modules/config-lookup/e-srv-config-lookup.c
index 40e44a4c43..e2fb1f0806 100644
--- a/src/modules/config-lookup/e-srv-config-lookup.c
+++ b/src/modules/config-lookup/e-srv-config-lookup.c
@@ -156,16 +156,6 @@ srv_config_lookup_domain_sync (EConfigLookup *config_lookup,
CamelNetworkSecurityMethod security_method;
const gchar *extension_name;
- extension_name = e_source_camel_get_extension_name
(known_services[ii].evo_protocol);
-
- if (g_str_has_suffix (known_services[ii].gio_protocol, "s"))
- security_method =
CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
- else
- security_method =
CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
-
- e_config_lookup_result_simple_add_enum (lookup_result,
extension_name, "security-method",
- CAMEL_TYPE_NETWORK_SECURITY_METHOD, security_method);
-
if (known_services[ii].kind == E_CONFIG_LOOKUP_RESULT_MAIL_RECEIVE)
extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
else
@@ -180,6 +170,16 @@ srv_config_lookup_domain_sync (EConfigLookup *config_lookup,
"method", "PLAIN");
}
+ extension_name = e_source_camel_get_extension_name
(known_services[ii].evo_protocol);
+
+ if (g_str_has_suffix (known_services[ii].gio_protocol, "s"))
+ security_method =
CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT;
+ else
+ security_method =
CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT;
+
+ e_config_lookup_result_simple_add_enum (lookup_result,
extension_name, "security-method",
+ CAMEL_TYPE_NETWORK_SECURITY_METHOD, security_method);
+
/* 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]