Fixes NB#103840, custom settings not properly set

pmo-trunk-r9178

diff --git a/src/modest-presets.c b/src/modest-presets.c
index 8649208..1bba4b6 100644 (file)
--- a/src/modest-presets.c
+++ b/src/modest-presets.c
@@ -256,8 +256,12 @@ 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_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, "0") == 0) {
+                               protocol_type = MODEST_PROTOCOLS_CONNECTION_TLS;
+                       } else if (val && strcmp (val, "1") == 0) {

                                protocol_type = MODEST_PROTOCOLS_CONNECTION_SSL;
                                protocol_type = MODEST_PROTOCOLS_CONNECTION_SSL;

+                       } else if (val && strcmp (val, "2") == 0) {
+                               protocol_type = MODEST_PROTOCOLS_CONNECTION_NONE;

                        } else if (val && (strcmp (val, "tls") == 0)) {
                                protocol_type = MODEST_PROTOCOLS_CONNECTION_TLS;
                        } else if (val && (strcmp (val, "ssl") == 0)) {
                        } else if (val && (strcmp (val, "tls") == 0)) {
                                protocol_type = MODEST_PROTOCOLS_CONNECTION_TLS;
                        } else if (val && (strcmp (val, "ssl") == 0)) {