X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-proto.c;h=379645352880f821b73e7bf5a3ae0161ee52f5c5;hp=d0d7702cfd765c48b334d9ba8edf9c324681f876;hb=0481ffb62ae390a89a75ac7a37173b4123845ee7;hpb=434ec10090daec7d9d80c1f419b9113d15d58fd4

diff --git a/src/modest-proto.c b/src/modest-proto.c
index d0d7702..3796453 100644
--- a/src/modest-proto.c
+++ b/src/modest-proto.c
@@ -1,41 +1,77 @@
+/* Copyright (c) 2006, Nokia Corporation
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the name of the Nokia Corporation nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
 #include <string.h>
 #include "modest-proto.h"
 
+static const gchar* transport_protos[] = {
+	MODEST_PROTO_SENDMAIL,
+	MODEST_PROTO_SMTP,
+	NULL
+};
+
+static const gchar* store_protos[] = {
+	MODEST_PROTO_NONE,
+	MODEST_PROTO_POP,
+	MODEST_PROTO_IMAP,
+	MODEST_PROTO_MAILDIR,
+	MODEST_PROTO_MBOX,
+	NULL
+};
 
 gboolean
-modest_proto_is_valid (const gchar *proto)
+modest_proto_is_valid (const gchar *proto, gboolean store_proto)
 {
 	int i;
-	static const gchar* protos[] = {
-		MODEST_PROTO_SENDMAIL,
-		MODEST_PROTO_SMTP,
-		MODEST_PROTO_POP,
-		MODEST_PROTO_IMAP,
-		NULL
-	};
 	
-	if (!proto)
-		return FALSE;
+	g_return_val_if_fail (proto, FALSE);
 
-	for (i = 0; protos[i]; ++i) {
+	const gchar** protos = (const gchar**)
+		store_proto ? store_protos : transport_protos;
+	
+	for (i = 0; protos[i]; ++i)
 		if (strcmp(protos[i], proto) == 0)
 			return TRUE;
-	}
 	
 	return FALSE;
 }
 
 
-	
 ModestProtoType
 modest_proto_type (const gchar *proto)
 {
-	if (!modest_proto_is_valid(proto)) {
-		g_warning ("invalid protocol %s", proto);
-		return -1;
-	}
-	
-	/* trick */
+	g_return_val_if_fail (proto, -1);
+	g_return_val_if_fail (modest_proto_is_valid (proto, TRUE) ||
+			      modest_proto_is_valid (proto, FALSE),
+			      -1);
+	/* trick */	
 	if (proto[0] == 's')
 		return MODEST_PROTO_TYPE_TRANSPORT;
 	else
@@ -44,3 +80,15 @@ modest_proto_type (const gchar *proto)
 
 
 
+const gchar**
+modest_proto_store_protos (void)
+{
+	return (const gchar **) store_protos;
+}
+
+
+const gchar**
+modest_proto_transport_protos (void)
+{
+	return (const gchar**) transport_protos;
+}