From: Jose Dapena Paz <jdapena@igalia.com>
Date: Tue, 24 Mar 2009 11:58:38 +0000 (+0000)
Subject: Added support in presets parser for detecting separately ssl and tls
X-Git-Tag: git_migration_finished~222
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=8f733cadfbb48f2d57b974cb987aaed44b3817af

Added support in presets parser for detecting separately ssl and tls

pmo-trunk-r8307
---

diff --git a/src/hildon2/modest-presets.c b/src/hildon2/modest-presets.c
index cb3e607..c41c9d6 100644
--- a/src/hildon2/modest-presets.c
+++ b/src/hildon2/modest-presets.c
@@ -258,6 +258,10 @@ modest_presets_get_info_server_security (ModestPresets *self, const gchar *provi
 						     MODEST_PRESETS_KEY_INCOMING_SECURITY, NULL);
 			if (val && ((strcmp (val, "1") == 0) || (strcmp (val, "2") == 0))) {
 				protocol_type = MODEST_PROTOCOLS_CONNECTION_SSL;
+			} else if (val && (strcmp (val, "tls") == 0)) {
+				protocol_type = MODEST_PROTOCOLS_CONNECTION_TLS;
+			} else if (val && (strcmp (val, "ssl") == 0)) {
+				protocol_type = MODEST_PROTOCOLS_CONNECTION_SSL;
 			}
 			g_free (val);
 		}
@@ -272,6 +276,10 @@ modest_presets_get_info_server_security (ModestPresets *self, const gchar *provi
 			/* 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)
+				protocol_type = MODEST_PROTOCOLS_CONNECTION_SSL;
+			else if (val && strcmp (val, "tls") == 0)
+				protocol_type = MODEST_PROTOCOLS_CONNECTION_TLS;
 			g_free(val);
 		}
 	}