aboutsummaryrefslogtreecommitdiffstats
path: root/capplet
diff options
context:
space:
mode:
authorGary Ching-Pang Lin <chingpang@gmail.com>2010-08-23 11:49:29 +0800
committerGary Ching-Pang Lin <chingpang@gmail.com>2010-08-23 12:36:45 +0800
commit242593df87629e19d4614266861ebb8f19004f01 (patch)
tree7f6d9182c2092377c4c0242f0c248a3385a3c51a /capplet
parentec9a3ed06d0f9b4d413be5710c416e65697aff22 (diff)
downloadgsoc2013-evolution-242593df87629e19d4614266861ebb8f19004f01.tar.gz
gsoc2013-evolution-242593df87629e19d4614266861ebb8f19004f01.tar.zst
gsoc2013-evolution-242593df87629e19d4614266861ebb8f19004f01.zip
Add encryption and authentication support for autoconfig
Bug 625627 - Fail to send mail with smtp.live.com with autoconfig
Diffstat (limited to 'capplet')
-rw-r--r--capplet/settings/mail-account-view.c36
1 files changed, 31 insertions, 5 deletions
diff --git a/capplet/settings/mail-account-view.c b/capplet/settings/mail-account-view.c
index 4410fa475d..7da2215f8d 100644
--- a/capplet/settings/mail-account-view.c
+++ b/capplet/settings/mail-account-view.c
@@ -954,18 +954,44 @@ emae_check_servers (const gchar *email)
else
sdata->proto = provider->recv_type;
if (provider->recv_socket_type) {
- if (g_ascii_strcasecmp(provider->recv_socket_type, "SSL") == 0)
+ if (g_ascii_strcasecmp(provider->recv_socket_type, "SSL") == 0) {
sdata->ssl = g_strdup("always");
- else if (g_ascii_strcasecmp(provider->recv_socket_type, "secure") == 0)
+ sdata->recv_sock = g_strdup("always");
+ }
+ else if (g_ascii_strcasecmp(provider->recv_socket_type, "secure") == 0) {
sdata->ssl = g_strdup("always");
- else if (g_ascii_strcasecmp(provider->recv_socket_type, "STARTTLS") == 0)
+ sdata->recv_sock = g_strdup("always");
+ }
+ else if (g_ascii_strcasecmp(provider->recv_socket_type, "STARTTLS") == 0) {
sdata->ssl = g_strdup("when-possible");
- else if (g_ascii_strcasecmp(provider->recv_socket_type, "TLS") == 0)
+ sdata->recv_sock = g_strdup("when-possible");
+ }
+ else if (g_ascii_strcasecmp(provider->recv_socket_type, "TLS") == 0) {
sdata->ssl = g_strdup("when-possible");
- else
+ sdata->recv_sock = g_strdup("when-possible");
+ }
+ else {
sdata->ssl = g_strdup("never");
+ sdata->recv_sock = g_strdup("never");
+ }
}
+
+ if (provider->send_socket_type) {
+ if (g_ascii_strcasecmp(provider->send_socket_type, "SSL") == 0)
+ sdata->send_sock = g_strdup("always");
+ else if (g_ascii_strcasecmp(provider->send_socket_type, "secure") == 0)
+ sdata->send_sock = g_strdup("always");
+ else if (g_ascii_strcasecmp(provider->send_socket_type, "STARTTLS") == 0)
+ sdata->send_sock = g_strdup("when-possible");
+ else if (g_ascii_strcasecmp(provider->send_socket_type, "TLS") == 0)
+ sdata->send_sock = g_strdup("when-possible");
+ else
+ sdata->send_sock = g_strdup("never");
+ }
+
+ sdata->send_auth = provider->send_auth;
+ sdata->recv_auth = provider->recv_auth;
sdata->send_user = provider->send_username;
sdata->recv_user = provider->recv_username;