X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodest-protocol-info.c;h=a771c01237ecec6727b346a0812b8c2b0f28b848;hb=16d7f8b9f45217e350735e33ee6d0255aa894074;hp=5a579aa3bc850f76677f4a550f6ae63e45b81a43;hpb=3aefa2e752a5a148fe8672f898618f7a8b8799ea;p=modest

diff --git a/src/modest-protocol-info.c b/src/modest-protocol-info.c
index 5a579aa..a771c01 100644
--- a/src/modest-protocol-info.c
+++ b/src/modest-protocol-info.c
@@ -32,7 +32,7 @@
 #include <modest-protocol-info.h>
 #include <modest-pair.h>
 #include <modest-defs.h>
-
+#include <modest-text-utils.h>
 
 typedef struct {
 	gint   proto;
@@ -94,35 +94,32 @@ get_protocol_by_name (const ProtocolInfo* map,
 	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((case_sensitive && strcmp(map[i].name, query_name) == 0) ||
-		   (!case_sensitive && g_ascii_strcasecmp(map[i].name, query_name) == 0))
-		{
+		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));
@@ -131,6 +128,8 @@ modest_protocol_info_get_connection_protocol_pair_list ()
 ModestTransportStoreProtocol
 modest_protocol_info_get_transport_store_protocol (const gchar* name)
 {
+	g_return_val_if_fail (name, MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN);
+	
 	return get_protocol_by_name(TransportStoreProtocolMap,
 	                            G_N_ELEMENTS(TransportStoreProtocolMap),
 	                            name,
@@ -141,6 +140,8 @@ modest_protocol_info_get_transport_store_protocol (const gchar* name)
 ModestAuthProtocol
 modest_protocol_info_get_auth_protocol (const gchar* name)
 {
+	g_return_val_if_fail (name, MODEST_PROTOCOL_AUTH_NONE);
+	
 	return get_protocol_by_name(AuthProtocolMap,
 	                            G_N_ELEMENTS(AuthProtocolMap),
 	                            name,