1 files changed, 40 insertions, 188 deletions

diff --git a/camel/providers/imap4/camel-imap4-engine.c b/camel/providers/imap4/camel-imap4-engine.c
index d6f17532ee..adbf862747 100644
--- a/camel/providers/imap4/camel-imap4-engine.c
+++ b/camel/providers/imap4/camel-imap4-engine.c
@@ -28,7 +28,6 @@
 
 #include <camel/camel-sasl.h>
 #include <camel/camel-stream-buffer.h>
-#include <camel/camel-i18n.h>
 
 #include "camel-imap4-summary.h"
 #include "camel-imap4-command.h"
@@ -115,6 +114,22 @@ camel_imap4_engine_init (CamelIMAP4Engine *engine, CamelIMAP4EngineClass *klass)
 }
 
 static void
+imap4_namespace_clear (CamelIMAP4Namespace **namespace)
+{
+	CamelIMAP4Namespace *node, *next;
+	
+	node = *namespace;
+	while (node != NULL) {
+		next = node->next;
+		g_free (node->path);
+		g_free (node);
+		node = next;
+	}
+	
+	*namespace = NULL;
+}
+
+static void
 camel_imap4_engine_finalize (CamelObject *object)
 {
 	CamelIMAP4Engine *engine = (CamelIMAP4Engine *) object;
@@ -129,9 +144,9 @@ camel_imap4_engine_finalize (CamelObject *object)
 	g_hash_table_foreach (engine->authtypes, (GHFunc) g_free, NULL);
 	g_hash_table_destroy (engine->authtypes);
 	
-	camel_imap4_namespace_clear (&engine->namespaces.personal);
-	camel_imap4_namespace_clear (&engine->namespaces.other);
-	camel_imap4_namespace_clear (&engine->namespaces.shared);
+	imap4_namespace_clear (&engine->namespaces.personal);
+	imap4_namespace_clear (&engine->namespaces.other);
+	imap4_namespace_clear (&engine->namespaces.shared);
 	
 	if (engine->folder)
 		camel_object_unref (engine->folder);
@@ -148,7 +163,6 @@ camel_imap4_engine_finalize (CamelObject *object)
 /**
  * camel_imap4_engine_new:
  * @service: service
- * @reconnect: reconnect callback function
  *
  * Returns a new imap4 engine
  **/
@@ -334,16 +348,6 @@ camel_imap4_engine_namespace (CamelIMAP4Engine *engine, CamelException *ex)
 }
 
 
-/**
- * camel_imap4_engine_select_folder:
- * @engine: IMAP4 engine
- * @folder: folder to select
- * @ex: exception
- *
- * Convenience function to select @folder.
- *
- * Returns 0 on success or -1 on fail.
- **/
 int
 camel_imap4_engine_select_folder (CamelIMAP4Engine *engine, CamelFolder *folder, CamelException *ex)
 {
@@ -435,15 +439,11 @@ static struct {
 	{ "IMAP4",         CAMEL_IMAP4_CAPABILITY_IMAP4         },
 	{ "IMAP4REV1",     CAMEL_IMAP4_CAPABILITY_IMAP4REV1     },
 	{ "STATUS",        CAMEL_IMAP4_CAPABILITY_STATUS        },
-	{ "NAMESPACE",     CAMEL_IMAP4_CAPABILITY_NAMESPACE     }, /* rfc2342 */
-	{ "UIDPLUS",       CAMEL_IMAP4_CAPABILITY_UIDPLUS       }, /* rfc2359 */
-	{ "LITERAL+",      CAMEL_IMAP4_CAPABILITY_LITERALPLUS   }, /* rfc2088 */
+	{ "NAMESPACE",     CAMEL_IMAP4_CAPABILITY_NAMESPACE     },
+	{ "UIDPLUS",       CAMEL_IMAP4_CAPABILITY_UIDPLUS       },
+	{ "LITERAL+",      CAMEL_IMAP4_CAPABILITY_LITERALPLUS   },
 	{ "LOGINDISABLED", CAMEL_IMAP4_CAPABILITY_LOGINDISABLED },
 	{ "STARTTLS",      CAMEL_IMAP4_CAPABILITY_STARTTLS      },
-	{ "QUOTA",         CAMEL_IMAP4_CAPABILITY_QUOTA         }, /* rfc2087 */
-	{ "ACL",           CAMEL_IMAP4_CAPABILITY_ACL           }, /* rfc2086 */
-	{ "IDLE",          CAMEL_IMAP4_CAPABILITY_IDLE          }, /* rfc2177 */
-	{ "MULTIAPPEND",   CAMEL_IMAP4_CAPABILITY_MULTIAPPEND   }, /* rfc3502 */
 	{ NULL,            0                                    }
 };
 
@@ -469,7 +469,7 @@ engine_parse_capability (CamelIMAP4Engine *engine, int sentinel, CamelException
 		return -1;
 	
 	while (token.token == CAMEL_IMAP4_TOKEN_ATOM) {
-		if (!g_ascii_strncasecmp ("AUTH=", token.v.atom, 5)) {
+		if (!strncasecmp ("AUTH=", token.v.atom, 5)) {
 			CamelServiceAuthType *auth;
 			
 			if ((auth = camel_sasl_authtype (token.v.atom + 5)) != NULL)
@@ -563,9 +563,9 @@ engine_parse_namespace (CamelIMAP4Engine *engine, CamelException *ex)
 	camel_imap4_token_t token;
 	int i, n = 0;
 	
-	camel_imap4_namespace_clear (&engine->namespaces.personal);
-	camel_imap4_namespace_clear (&engine->namespaces.other);
-	camel_imap4_namespace_clear (&engine->namespaces.shared);
+	imap4_namespace_clear (&engine->namespaces.personal);
+	imap4_namespace_clear (&engine->namespaces.other);
+	imap4_namespace_clear (&engine->namespaces.shared);
 	
 	if (camel_imap4_engine_next_token (engine, &token, ex) == -1)
 		return -1;
@@ -604,19 +604,8 @@ engine_parse_namespace (CamelIMAP4Engine *engine, CamelException *ex)
 					goto exception;
 				}
 				
-				switch (token.token) {
-				case CAMEL_IMAP4_TOKEN_NIL:
-					node->sep = '\0';
-					break;
-				case CAMEL_IMAP4_TOKEN_QSTRING:
-					if (strlen (token.v.qstring) == 1) {
-						node->sep = *token.v.qstring;
-						break;
-					} else {
-						/* invalid, fall thru */
-					}
-				default:
-					d(fprintf (stderr, "Expected to find a nil or a valid qstring token as second element in NAMESPACE pair\n"));
+				if (token.token != CAMEL_IMAP4_TOKEN_QSTRING || strlen (token.v.qstring) > 1) {
+					d(fprintf (stderr, "Expected to find a qstring token as second element in NAMESPACE pair\n"));
 					camel_imap4_utils_set_unexpected_token_error (ex, engine, &token);
 					g_free (node->path);
 					g_free (node);
@@ -624,6 +613,7 @@ engine_parse_namespace (CamelIMAP4Engine *engine, CamelException *ex)
 					goto exception;
 				}
 				
+				node->sep = *token.v.qstring;
 				tail->next = node;
 				tail = node;
 				
@@ -682,7 +672,7 @@ engine_parse_namespace (CamelIMAP4Engine *engine, CamelException *ex)
  exception:
 	
 	for (i = 0; i <= n; i++)
-		camel_imap4_namespace_clear (&namespaces[i]);
+		imap4_namespace_clear (&namespaces[i]);
 	
 	return -1;
 }
@@ -723,15 +713,6 @@ static struct {
 };
 
 
-/**
- * camel_imap4_engine_parse_resp_code:
- * @engine: IMAP4 engine
- * @ex: exception
- *
- * Parses a RESP-CODE
- *
- * Returns 0 on success or -1 on fail.
- **/
 int
 camel_imap4_engine_parse_resp_code (CamelIMAP4Engine *engine, CamelException *ex)
 {
@@ -900,34 +881,26 @@ camel_imap4_engine_parse_resp_code (CamelIMAP4Engine *engine, CamelException *ex
 		if (camel_imap4_engine_next_token (engine, &token, ex) == -1)
 			return -1;
 		
-		if (token.token != CAMEL_IMAP4_TOKEN_ATOM && token.token != CAMEL_IMAP4_TOKEN_NUMBER) {
-			d(fprintf (stderr, "Expected an atom or numeric token as the second argument to the COPYUID RESP-CODE\n"));
+		if (token.token != CAMEL_IMAP4_TOKEN_ATOM) {
+			d(fprintf (stderr, "Expected an atom token as the second argument to the COPYUID RESP-CODE\n"));
 			camel_imap4_utils_set_unexpected_token_error (ex, engine, &token);
 			goto exception;
 		}
 		
-		if (resp != NULL) {
-			if (token.token == CAMEL_IMAP4_TOKEN_NUMBER)
-				resp->v.copyuid.srcset = g_strdup_printf ("%u", token.v.number);
-			else
-				resp->v.copyuid.srcset = g_strdup (token.v.atom);
-		}
+		if (resp != NULL)
+			resp->v.copyuid.srcset = g_strdup (token.v.atom);
 		
 		if (camel_imap4_engine_next_token (engine, &token, ex) == -1)
 			return -1;
 		
-		if (token.token != CAMEL_IMAP4_TOKEN_ATOM && token.token != CAMEL_IMAP4_TOKEN_NUMBER) {
-			d(fprintf (stderr, "Expected an atom or numeric token as the third argument to the APPENDUID RESP-CODE\n"));
+		if (token.token != CAMEL_IMAP4_TOKEN_ATOM) {
+			d(fprintf (stderr, "Expected an atom token as the third argument to the APPENDUID RESP-CODE\n"));
 			camel_imap4_utils_set_unexpected_token_error (ex, engine, &token);
 			goto exception;
 		}
 		
-		if (resp != NULL) {
-			if (token.token == CAMEL_IMAP4_TOKEN_NUMBER)
-				resp->v.copyuid.destset = g_strdup_printf ("%u", token.v.number);
-			else
-				resp->v.copyuid.destset = g_strdup (token.v.atom);
-		}
+		if (resp != NULL)
+			resp->v.copyuid.destset = g_strdup (token.v.atom);
 		
 		break;
 	default:
@@ -986,17 +959,8 @@ camel_imap4_engine_parse_resp_code (CamelIMAP4Engine *engine, CamelException *ex
 }
 
 
-/**
- * camel_imap4_engine_handle_untagged_1:
- * @engine: IMAP4 engine
- * @token: IMAP4 token
- * @ex: exception
- *
- * Handles a single untagged response
- *
- * Returns -1 on error or one of
- * CAMEL_IMAP4_UNTAGGED_[OK,NO,BAD,PREAUTH,HANDLED] on success
- **/
+
+/* returns -1 on error, or one of CAMEL_IMAP4_UNTAGGED_[OK,NO,BAD,PREAUTH,HANDLED] on success */
 int
 camel_imap4_engine_handle_untagged_1 (CamelIMAP4Engine *engine, camel_imap4_token_t *token, CamelException *ex)
 {
@@ -1149,13 +1113,6 @@ camel_imap4_engine_handle_untagged_1 (CamelIMAP4Engine *engine, camel_imap4_toke
 }
 
 
-/**
- * camel_imap4_engine_handle_untagged:
- * @engine: IMAP4 engine
- * @ex: exception
- *
- * Handle a stream of untagged responses.
- **/
 void
 camel_imap4_engine_handle_untagged (CamelIMAP4Engine *engine, CamelException *ex)
 {
@@ -1254,7 +1211,6 @@ engine_state_change (CamelIMAP4Engine *engine, CamelIMAP4Command *ic)
 	return retval;
 }
 
-
 /**
  * camel_imap4_engine_iterate:
  * @engine: IMAP4 engine
@@ -1421,13 +1377,6 @@ camel_imap4_engine_prequeue (CamelIMAP4Engine *engine, CamelFolder *folder, cons
 }
 
 
-/**
- * camel_imap4_engine_dequeue:
- * @engine: IMAP4 engine
- * @ic: IMAP4 command
- *
- * Removes @ic from the processing queue.
- **/
 void
 camel_imap4_engine_dequeue (CamelIMAP4Engine *engine, CamelIMAP4Command *ic)
 {
@@ -1444,18 +1393,6 @@ camel_imap4_engine_dequeue (CamelIMAP4Engine *engine, CamelIMAP4Command *ic)
 }
 
 
-/**
- * camel_imap4_engine_next_token:
- * @engine: IMAP4 engine
- * @token: IMAP4 token
- * @ex: exception
- *
- * Wraps camel_imap4_stream_next_token() to set an exception on
- * failure and updates the engine state to DISCONNECTED if the stream
- * gets disconencted.
- *
- * Returns 0 on success or -1 on fail.
- **/
 int
 camel_imap4_engine_next_token (CamelIMAP4Engine *engine, camel_imap4_token_t *token, CamelException *ex)
 {
@@ -1473,15 +1410,6 @@ camel_imap4_engine_next_token (CamelIMAP4Engine *engine, camel_imap4_token_t *to
 }
 
 
-/**
- * camel_imap4_engine_eat_line:
- * @engine: IMAP4 engine
- * @ex: exception
- *
- * Gobbles up the remainder of the response line.
- *
- * Returns 0 on success or -1 on fail
- **/
 int
 camel_imap4_engine_eat_line (CamelIMAP4Engine *engine, CamelException *ex)
 {
@@ -1514,19 +1442,6 @@ camel_imap4_engine_eat_line (CamelIMAP4Engine *engine, CamelException *ex)
 }
 
 
-/**
- * camel_imap4_engine_line:
- * @engine: IMAP4 engine
- * @line: line pointer
- * @len: length pointer
- * @ex: exception
- *
- * Reads in a single line of input from the IMAP4 server and updates
- * @line to point to the line buffer. @len is set to the length of the
- * line buffer. @line must be free'd using g_free().
- *
- * Returns 0 on success or -1 on fail
- **/
 int
 camel_imap4_engine_line (CamelIMAP4Engine *engine, unsigned char **line, size_t *len, CamelException *ex)
 {
@@ -1569,20 +1484,6 @@ camel_imap4_engine_line (CamelIMAP4Engine *engine, unsigned char **line, size_t
 }
 
 
-/**
- * camel_imap4_engine_literal:
- * @engine: IMAP4 engine
- * @literal: literal pointer
- * @len: len pointer
- * @ex: exception
- *
- * Reads in an entire literal string and updates @literal to point to
- * it. @len is set to the length of the literal. @literal will also
- * conveniently be terminated with a nul-byte. @literal must be free'd
- * using g_free().
- *
- * Returns 0 on success or -1 on fail.
- **/
 int
 camel_imap4_engine_literal (CamelIMAP4Engine *engine, unsigned char **literal, size_t *len, CamelException *ex)
 {
@@ -1626,55 +1527,6 @@ camel_imap4_engine_literal (CamelIMAP4Engine *engine, unsigned char **literal, s
 }
 
 
-/**
- * camel_imap4_engine_nstring:
- * @engine: IMAP4 engine
- * @nstring: nstring pointer
- * @ex: exception
- *
- * Reads in an nstring (NIL, atom, qstring or literal) and updates
- * @nstring to point to it. @nstring must be free'd using g_free().
- *
- * Returns 0 on success or -1 on fail.
- **/
-int
-camel_imap4_engine_nstring (CamelIMAP4Engine *engine, unsigned char **nstring, CamelException *ex)
-{
-	camel_imap4_token_t token;
-	size_t n;
-	
-	if (camel_imap4_engine_next_token (engine, &token, ex) == -1)
-		return -1;
-	
-	switch (token.token) {
-	case CAMEL_IMAP4_TOKEN_NIL:
-		*nstring = NULL;
-		break;
-	case CAMEL_IMAP4_TOKEN_ATOM:
-		*nstring = g_strdup (token.v.atom);
-		break;
-	case CAMEL_IMAP4_TOKEN_QSTRING:
-		*nstring = g_strdup (token.v.qstring);
-		break;
-	case CAMEL_IMAP4_TOKEN_LITERAL:
-		if (camel_imap4_engine_literal (engine, nstring, &n, ex) == -1)
-			return -1;
-		break;
-	default:
-		camel_imap4_utils_set_unexpected_token_error (ex, engine, &token);
-		return -1;
-	}
-	
-	return 0;
-}
-
-
-/**
- * camel_imap4_resp_code_free:
- * @rcode: RESP-CODE
- *
- * Free's the RESP-CODE
- **/
 void
 camel_imap4_resp_code_free (CamelIMAP4RespCode *rcode)
 {