X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-protocol-info.c;h=b0ce3033199306ee52241f56f128eb3e06c05d9e;hp=8539f20feed42dfac2dd49d9bf0ca95d3a4c7d49;hb=8ca4cfa4cf41f383bdcbe2a7715ae8281bdbb626;hpb=6bab4bfef92fef73852d6acd51d1ebf381a338e4

diff --git a/src/modest-protocol-info.c b/src/modest-protocol-info.c
index 8539f20..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 {
@@ -60,9 +61,9 @@ static const ProtocolInfo ConnectionProtocolMap[] = {
 
 /* 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") }
 };
 
 
@@ -180,3 +181,15 @@ modest_protocol_info_protocol_is_store (ModestTransportStoreProtocol proto)
 	return proto == MODEST_PROTOCOL_STORE_MBOX || proto == MODEST_PROTOCOL_STORE_MAILDIR ||
 		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);
+}