callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ESrvConfigLookup: Use correct extension name for properties

Browse Source 
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'
This commit is contained in:
Milan Crha
2021-09-17 12:10:18 +02:00
parent 7aad8d1dcd
commit 7733d88903
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/config-lookup/e-srv-config-lookup.c
View File

@ -156,16 +156,6 @@ srv_config_lookup_domain_sync (EConfigLookup *config_lookup,
CamelNetworkSecurityMethod security_method; CamelNetworkSecurityMethod security_method;
const gchar *extension_name; 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) if (known_services[ii].kind == E_CONFIG_LOOKUP_RESULT_MAIL_RECEIVE)
extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT; extension_name = E_SOURCE_EXTENSION_MAIL_ACCOUNT;
else else
@ -180,6 +170,16 @@ srv_config_lookup_domain_sync (EConfigLookup *config_lookup,
"method", "PLAIN"); "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 /* Set the security method before the port, to not have it overwritten
in New Mail Account wizard (binding callback). */ 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_string (lookup_result, extension_name, "host", hostname);