projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added separator label to global settings dialog
[modest]
/
src
/
modest-presets.c
diff --git
a/src/modest-presets.c
b/src/modest-presets.c
index
8649208
..
7f9e790
100644
(file)
--- a/
src/modest-presets.c
+++ b/
src/modest-presets.c
@@
-233,7
+233,7
@@
modest_presets_get_info_server_type (ModestPresets *self,
g_free (val);
/* debug: */
g_free (val);
/* debug: */
-/* g_message ("provider id: %s, server type: %d", provider_id, info); */
+/* g_debug ("provider id: %s, server type: %d", provider_id, info); */
return protocol_type;
}
return protocol_type;
}
@@
-252,11
+252,13
@@
modest_presets_get_info_server_security (ModestPresets *self, const gchar *provi
val = g_key_file_get_string (self->keyfile, provider_id,
MODEST_PRESETS_KEY_INCOMING, NULL);
if (val) {
val = g_key_file_get_string (self->keyfile, provider_id,
MODEST_PRESETS_KEY_INCOMING, NULL);
if (val) {
- g_free (val);
+ g_free (val);
val = g_key_file_get_string (self->keyfile, provider_id,
MODEST_PRESETS_KEY_INCOMING_SECURITY, NULL);
val = g_key_file_get_string (self->keyfile, provider_id,
MODEST_PRESETS_KEY_INCOMING_SECURITY, NULL);
- if (val && ((strcmp (val, "1") == 0) || (strcmp (val, "2") == 0))) {
+ if (val && strcmp (val, "1") == 0) {
+ protocol_type = MODEST_PROTOCOLS_CONNECTION_TLS;
+ } else if (val && strcmp (val, "2") == 0) {
protocol_type = MODEST_PROTOCOLS_CONNECTION_SSL;
} else if (val && (strcmp (val, "tls") == 0)) {
protocol_type = MODEST_PROTOCOLS_CONNECTION_TLS;
protocol_type = MODEST_PROTOCOLS_CONNECTION_SSL;
} else if (val && (strcmp (val, "tls") == 0)) {
protocol_type = MODEST_PROTOCOLS_CONNECTION_TLS;
@@
-270,10
+272,9
@@
modest_presets_get_info_server_security (ModestPresets *self, const gchar *provi
MODEST_PRESETS_KEY_OUTGOING, NULL);
if (val) {
g_free (val);
MODEST_PRESETS_KEY_OUTGOING, NULL);
if (val) {
g_free (val);
-
+
val = g_key_file_get_string (self->keyfile, provider_id,
MODEST_PRESETS_KEY_SECURE_SMTP, NULL);
val = g_key_file_get_string (self->keyfile, provider_id,
MODEST_PRESETS_KEY_SECURE_SMTP, NULL);
- /* printf("debug: %s: provider_id=%s, secure-smtp val=%s\n", __FUNCTION__, provider_id, val); */
if (val && strcmp(val,"true") == 0)
protocol_type = MODEST_PROTOCOLS_CONNECTION_SSL;
else if (val && strcmp (val, "ssl") == 0)
if (val && strcmp(val,"true") == 0)
protocol_type = MODEST_PROTOCOLS_CONNECTION_SSL;
else if (val && strcmp (val, "ssl") == 0)