|
 |
a9434d |
diff -up evolution-data-server-3.22.7/modules/gnome-online-accounts/module-gnome-online-accounts.c.goa-prefer-ssl evolution-data-server-3.22.7/modules/gnome-online-accounts/module-gnome-online-accounts.c
|
|
|
a9434d |
--- evolution-data-server-3.22.7/modules/gnome-online-accounts/module-gnome-online-accounts.c.goa-prefer-ssl 2017-03-20 10:07:46.000000000 +0100
|
|
|
a9434d |
+++ evolution-data-server-3.22.7/modules/gnome-online-accounts/module-gnome-online-accounts.c 2017-10-19 17:31:45.489348625 +0200
|
|
|
a9434d |
@@ -392,13 +392,11 @@ gnome_online_accounts_config_imap (EGnom
|
|
|
a9434d |
CAMEL_NETWORK_SETTINGS (settings),
|
|
|
a9434d |
goa_mail_get_imap_user_name (goa_mail));
|
|
|
a9434d |
|
|
|
a9434d |
- /* Prefer "use_tls" over "use_ssl" if both are set. */
|
|
|
a9434d |
+ /* Prefer "use_ssl" over "use_tls" if both are set. */
|
|
|
a9434d |
camel_network_settings_set_security_method (
|
|
|
a9434d |
CAMEL_NETWORK_SETTINGS (settings),
|
|
|
a9434d |
- use_tls ?
|
|
|
a9434d |
- CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT :
|
|
|
a9434d |
- use_ssl ?
|
|
|
a9434d |
- CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT :
|
|
|
a9434d |
+ use_ssl ? CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT :
|
|
|
a9434d |
+ use_tls ? CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT :
|
|
|
a9434d |
CAMEL_NETWORK_SECURITY_METHOD_NONE);
|
|
|
a9434d |
|
|
|
a9434d |
g_object_unref (network_address);
|
|
|
a9434d |
@@ -477,13 +475,11 @@ gnome_online_accounts_config_smtp (EGnom
|
|
|
a9434d |
CAMEL_NETWORK_SETTINGS (settings),
|
|
|
a9434d |
gnome_online_accounts_get_smtp_auth (goa_mail));
|
|
|
a9434d |
|
|
|
a9434d |
- /* Prefer "use_tls" over "use_ssl" if both are set. */
|
|
|
a9434d |
+ /* Prefer "use_ssl" over "use_tls" if both are set. */
|
|
|
a9434d |
camel_network_settings_set_security_method (
|
|
|
a9434d |
CAMEL_NETWORK_SETTINGS (settings),
|
|
|
a9434d |
- use_tls ?
|
|
|
a9434d |
- CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT :
|
|
|
a9434d |
- use_ssl ?
|
|
|
a9434d |
- CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT :
|
|
|
a9434d |
+ use_ssl ? CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT :
|
|
|
a9434d |
+ use_tls ? CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT :
|
|
|
a9434d |
CAMEL_NETWORK_SECURITY_METHOD_NONE);
|
|
|
a9434d |
|
|
|
a9434d |
g_object_unref (network_address);
|
|
|
a9434d |
diff -up evolution-data-server-3.22.7/modules/google-backend/module-google-backend.c.goa-prefer-ssl evolution-data-server-3.22.7/modules/google-backend/module-google-backend.c
|
|
|
a9434d |
--- evolution-data-server-3.22.7/modules/google-backend/module-google-backend.c.goa-prefer-ssl 2017-03-20 10:07:46.000000000 +0100
|
|
|
a9434d |
+++ evolution-data-server-3.22.7/modules/google-backend/module-google-backend.c 2017-10-19 17:31:52.929348522 +0200
|
|
|
a9434d |
@@ -49,8 +49,8 @@
|
|
|
a9434d |
/* SMTP Configuration Details */
|
|
|
a9434d |
#define GOOGLE_SMTP_BACKEND_NAME "smtp"
|
|
|
a9434d |
#define GOOGLE_SMTP_HOST "smtp.googlemail.com"
|
|
|
a9434d |
-#define GOOGLE_SMTP_PORT 587
|
|
|
a9434d |
-#define GOOGLE_SMTP_SECURITY_METHOD METHOD (STARTTLS_ON_STANDARD_PORT)
|
|
|
a9434d |
+#define GOOGLE_SMTP_PORT 465
|
|
|
a9434d |
+#define GOOGLE_SMTP_SECURITY_METHOD METHOD (SSL_ON_ALTERNATE_PORT)
|
|
|
a9434d |
|
|
|
a9434d |
/* Contacts Configuration Details */
|
|
|
a9434d |
#define GOOGLE_CONTACTS_BACKEND_NAME "google"
|