2007-04-30 Murray Cumming <murrayc@murrayc.com>

[modest] / src / modest-protocol-info.c

diff --git a/src/modest-protocol-info.c b/src/modest-protocol-info.c
index 0508daf..42584d0 100644 (file)
--- a/src/modest-protocol-info.c
+++ b/src/modest-protocol-info.c
@@ -48,11 +48,14 @@ static const ProtocolInfo ProtocolMap[] = {
        { MODEST_PROTOCOL_STORE_MAILDIR,      "maildir",  N_("Maildir") },
        { MODEST_PROTOCOL_STORE_MBOX,         "mbox",     N_("MBox") },     
 
+       { MODEST_PROTOCOL_SECURITY_NONE,      "none",     N_("None") },   
        { MODEST_PROTOCOL_SECURITY_SSL,       "ssl",      N_("SSL") },   
        { MODEST_PROTOCOL_SECURITY_TLS,       "tls",      N_("TLS") },
+       { MODEST_PROTOCOL_SECURITY_TLS_OP,    "tls-op",   N_("TLS when possible") }, /* op stands for optional */
 
-       { MODEST_PROTOCOL_AUTH_NONE,          "none",     N_("none") },
-       { MODEST_PROTOCOL_AUTH_PASSWORD,      "password", N_("Password") }
+       { MODEST_PROTOCOL_AUTH_NONE,          "none",     N_("None") },
+       { MODEST_PROTOCOL_AUTH_PASSWORD,      "password", N_("Password") },
+       { MODEST_PROTOCOL_AUTH_CRAMMD5,       "cram-md5", N_("Cram MD5") }
 };
 const guint PROTOCOL_MAP_SIZE = sizeof(ProtocolMap)/sizeof(ProtocolInfo);
 
@@ -60,7 +63,7 @@ const guint PROTOCOL_MAP_SIZE = sizeof(ProtocolMap)/sizeof(ProtocolInfo);
 GSList*
 modest_protocol_info_get_protocol_list (ModestProtocolType type)
 {
-       GSList *proto_list;
+       GSList *proto_list = NULL;
        int i;
        
        g_return_val_if_fail (type > MODEST_PROTOCOL_TYPE_UNKNOWN &&
@@ -80,7 +83,7 @@ modest_protocol_info_get_protocol_list (ModestProtocolType type)
 ModestPairList*
 modest_protocol_info_get_protocol_pair_list (ModestProtocolType type)
 {
-       ModestPairList *proto_list;
+       ModestPairList *proto_list = NULL;
        int i;
        
        g_return_val_if_fail (type > MODEST_PROTOCOL_TYPE_UNKNOWN && type < MODEST_PROTOCOL_TYPE_NUM,
@@ -113,16 +116,18 @@ modest_protocol_info_get_protocol_type (ModestProtocol proto)
        case MODEST_PROTOCOL_STORE_MBOX:
                return MODEST_PROTOCOL_TYPE_STORE;
 
+       case MODEST_PROTOCOL_SECURITY_NONE:
        case MODEST_PROTOCOL_SECURITY_SSL:   
        case MODEST_PROTOCOL_SECURITY_TLS:
+       case MODEST_PROTOCOL_SECURITY_TLS_OP:
                return MODEST_PROTOCOL_TYPE_SECURITY;
 
        case MODEST_PROTOCOL_AUTH_NONE:
        case MODEST_PROTOCOL_AUTH_PASSWORD:
                return MODEST_PROTOCOL_TYPE_AUTH;
-
+               
        default:
-               g_return_val_if_reached (MODEST_PROTOCOL_TYPE_UNKNOWN);
+               return MODEST_PROTOCOL_TYPE_UNKNOWN;
        }
 }