X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-protocol-info.c;h=a771c01237ecec6727b346a0812b8c2b0f28b848;hb=8909d391c15ca22c72087029ed2c6eddebefe4e8;hp=503d15a2091478c33c6371f94644cf81ddf36dda;hpb=bad70d1af9ab9d707c8a65e990338d3ab0820b6c;p=modest

diff --git a/src/modest-protocol-info.c b/src/modest-protocol-info.c
index 503d15a..a771c01 100644
--- a/src/modest-protocol-info.c
+++ b/src/modest-protocol-info.c
@@ -31,7 +31,8 @@
 #include <string.h> /* strcmp */
 #include <modest-protocol-info.h>
 #include <modest-pair.h>
-
+#include <modest-defs.h>
+#include <modest-text-utils.h>
 
 typedef struct {
 	gint   proto;
@@ -60,12 +61,11 @@ 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") }
 };
 
-
 static ModestPairList*
 get_protocol_pair_list (const ProtocolInfo* map, guint size)
 {
@@ -84,51 +84,72 @@ get_protocol_pair_list (const ProtocolInfo* map, guint size)
 	return proto_list;
 }
 
+static gint
+get_protocol_by_name (const ProtocolInfo* map,
+                      guint size,
+                      const gchar* query_name,
+                      gint default_value,
+                      gboolean case_sensitive)
+{
+	guint i;
+
+	g_return_val_if_fail (map, default_value);
+	g_return_val_if_fail (query_name, default_value);
+	
+	for(i = 0; i < size; ++i)
+		if (modest_text_utils_utf8_strcmp (map[i].name, query_name,
+						   !case_sensitive) == 0)
+			return map[i].proto;
+	
+	return default_value;
+}
 
 ModestPairList*
-modest_protocol_info_get_transport_store_protocol_pair_list ()
+modest_protocol_info_get_transport_store_protocol_pair_list (void)
 {
 	return get_protocol_pair_list (TransportStoreProtocolMap,
 		G_N_ELEMENTS(TransportStoreProtocolMap));
 }
 
 ModestPairList*
-modest_protocol_info_get_auth_protocol_pair_list ()
+modest_protocol_info_get_auth_protocol_pair_list (void)
 {
 	return get_protocol_pair_list (AuthProtocolMap,
 		G_N_ELEMENTS(AuthProtocolMap));
 }
 
 ModestPairList*
-modest_protocol_info_get_connection_protocol_pair_list ()
+modest_protocol_info_get_connection_protocol_pair_list (void)
 {
 	return get_protocol_pair_list (ConnectionProtocolMap,
 		G_N_ELEMENTS(ConnectionProtocolMap));
 }
 	
-
 ModestTransportStoreProtocol
 modest_protocol_info_get_transport_store_protocol (const gchar* name)
 {
-	const ProtocolInfo *map = TransportStoreProtocolMap;
-	const guint size = G_N_ELEMENTS(TransportStoreProtocolMap);
-	int i;
-	
 	g_return_val_if_fail (name, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
 	
-	g_return_val_if_fail (map, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
+	return get_protocol_by_name(TransportStoreProtocolMap,
+	                            G_N_ELEMENTS(TransportStoreProtocolMap),
+	                            name,
+	                            MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN,
+	                            TRUE);
+}
 
-	for (i = 0; i != size; ++i) {
-		const ProtocolInfo info = map[i];
-		if (strcmp(name, info.name) == 0)
-			return info.proto;
-	}
+ModestAuthProtocol
+modest_protocol_info_get_auth_protocol (const gchar* name)
+{
+	g_return_val_if_fail (name, MODEST_PROTOCOL_AUTH_NONE);
 	
-	return MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
+	return get_protocol_by_name(AuthProtocolMap,
+	                            G_N_ELEMENTS(AuthProtocolMap),
+	                            name,
+	                            MODEST_PROTOCOL_AUTH_NONE,
+	                            FALSE);
 }
 
 
-
 /* get either the name or the display_name for the protocol */
 static const gchar*
 get_protocol_string (gint proto, const ProtocolInfo* map, guint size, gboolean get_name)