X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-protocol-info.c;h=b0ce3033199306ee52241f56f128eb3e06c05d9e;hp=7c3a4c7c3b95fb8649ba74a491e324cffa3b5c98;hb=49eface34d96273a24307419e40208f319f86599;hpb=1807d0ffbcc503686889d878c8a37b5c31f30b23

diff --git a/src/modest-protocol-info.c b/src/modest-protocol-info.c
index 7c3a4c7..b0ce303 100644
--- a/src/modest-protocol-info.c
+++ b/src/modest-protocol-info.c
@@ -31,6 +31,7 @@
 #include <string.h> /* strcmp */
 #include <modest-protocol-info.h>
 #include <modest-pair.h>
+#include <modest-defs.h>
 
 
 typedef struct {
@@ -56,10 +57,13 @@ static const ProtocolInfo ConnectionProtocolMap[] = {
 	{ MODEST_PROTOCOL_CONNECTION_TLS_OP,    "tls-op",   N_("TLS when possible") }
 	/* op stands for optional */
 };
+
+
+/* FIXME: these names must match those of tny_camel_account_get_supported_secure_auth */
 static const ProtocolInfo AuthProtocolMap[] = {
-	{ MODEST_PROTOCOL_AUTH_NONE,          "none",     N_("None") },
-	{ MODEST_PROTOCOL_AUTH_PASSWORD,      "password", N_("Password") },
-	{ MODEST_PROTOCOL_AUTH_CRAMMD5,       "cram-md5", N_("Cram MD5") }
+	{ MODEST_PROTOCOL_AUTH_NONE,          MODEST_ACCOUNT_AUTH_MECH_VALUE_NONE,     N_("None") },
+	{ MODEST_PROTOCOL_AUTH_PASSWORD,      MODEST_ACCOUNT_AUTH_MECH_VALUE_PASSWORD, N_("Password") },
+	{ MODEST_PROTOCOL_AUTH_CRAMMD5,       MODEST_ACCOUNT_AUTH_MECH_VALUE_CRAMMD5, N_("Cram MD5") }
 };
 
 
@@ -178,4 +182,14 @@ modest_protocol_info_protocol_is_store (ModestTransportStoreProtocol proto)
 		proto == MODEST_PROTOCOL_STORE_POP || proto == MODEST_PROTOCOL_STORE_IMAP;
 }
 
+gboolean
+modest_protocol_info_is_secure(ModestConnectionProtocol protocol)
+{
+	return (protocol == MODEST_PROTOCOL_CONNECTION_SSL ||
+					protocol == MODEST_PROTOCOL_CONNECTION_TLS);
+}
 
+gboolean modest_protocol_info_auth_is_secure(ModestAuthProtocol protocol)
+{
+	return (protocol == MODEST_PROTOCOL_AUTH_CRAMMD5);
+}