[evolution-kolab/gnome-2-30] IMAPX: fixup issues so it builds again

[Christian Hilberg <chilberg src gnome org>]

commit 0dd57e6c12a2c79f94b6bfb9825a3fc6039cf30f
Author: Christian Hilberg <hilberg kernelconcepts de>
Date:   Wed Nov 16 14:49:09 2011 +0100

    IMAPX: fixup issues so it builds again
    
    * allow '-std=c99' for foreign camel code, to be reverted back
      to -ansi once the new Camel code is pulled in
    * fixed C++ style comments

 src/camel/providers/imapx/Makefile.am           |    1 +
 src/camel/providers/imapx/camel-imapx-server.c  |   37 ++++++++++++-----------
 src/camel/providers/imapx/camel-imapx-summary.c |    2 +-
 src/camel/providers/imapx/camel-imapx-summary.h |    2 +-
 src/camel/providers/imapx/camel-imapx-utils.c   |    4 +-
 5 files changed, 24 insertions(+), 22 deletions(-)
---
diff --git a/src/camel/providers/imapx/Makefile.am b/src/camel/providers/imapx/Makefile.am
index 50128ed..1c3aa70 100644
--- a/src/camel/providers/imapx/Makefile.am
+++ b/src/camel/providers/imapx/Makefile.am
@@ -25,6 +25,7 @@ libcamelimapx_la_CFLAGS = \
 	$(CFLAGS) \
 	$(ADD_CFLAGS) \
 	$(SQLITE_CFLAGS) \
+	-std=gnu99 \
 	-Wno-switch-default \
 	-Wno-conversion \
 	-Wno-sign-compare \
diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
index 0860f24..5cc23ee 100644
--- a/src/camel/providers/imapx/camel-imapx-server.c
+++ b/src/camel/providers/imapx/camel-imapx-server.c
@@ -40,7 +40,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-// fixme, use own type funcs
+/* fixme, use own type funcs */
 #include <ctype.h>
 
 #ifdef HAVE_NSS
@@ -269,8 +269,8 @@ struct _CamelIMAPXJob {
 
 	void (*start)(CamelIMAPXServer *is, struct _CamelIMAPXJob *job);
 
-	// ??
-	//CamelOperation *op;
+	/* ?? */
+	/* CamelOperation *op; */
 
 	gint noreply:1;		/* dont wait for reply */
 	guint32 type;		/* operation type */
@@ -622,7 +622,7 @@ imapx_command_addv(CamelIMAPXCommand *ic, const gchar *fmt, va_list ap)
 				} while (c);
 
 				do {
-					// FIXME: ascii isdigit
+					/* FIXME: ascii isdigit */
 					if (isdigit(c))
 						width = width * 10 + (c-'0');
 					else
@@ -1527,12 +1527,12 @@ imapx_continuation(CamelIMAPXServer *imap, CamelException *ex, gboolean litplus)
 
 		c(printf("writing file '%s' to literal\n", (gchar *)cp->ob));
 
-		// FIXME: errors
+		/* FIXME: errors */
 		if (cp->ob && (file = camel_stream_fs_new_with_name(cp->ob, O_RDONLY, 0))) {
 			camel_stream_write_to_stream(file, (CamelStream *)imap->stream);
 			camel_object_unref(file);
 		} else if (cp->ob_size > 0) {
-			// Server is expecting data ... ummm, send it zeros?  abort?
+			/* Server is expecting data ... ummm, send it zeros?  abort? */
 		}
 		break; }
 	case CAMEL_IMAPX_COMMAND_STRING:
@@ -1629,11 +1629,12 @@ imapx_completion(CamelIMAPXServer *imap, guchar *token, gint len, CamelException
 	}
 
 	/* A follow-on command might've already queued a new literal since were were done with ours? */
-//	if (imap->literal != NULL) {
-//		QUEUE_UNLOCK(imap);
-//		camel_exception_throw(1, "command still has outstanding continuation", imap->literal->name);
-//	}
-
+#if 0
+	if (imap->literal != NULL) {
+		QUEUE_UNLOCK(imap);
+		camel_exception_throw(1, "command still has outstanding continuation", imap->literal->name);
+	}
+#endif
 	camel_dlist_remove ((CamelDListNode *) ic);
 	QUEUE_UNLOCK(imap);
 
@@ -1656,7 +1657,7 @@ imapx_step(CamelIMAPXServer *is, CamelException *ex)
 	guchar *token;
 	gint tok;
 
-	// poll ?  wait for other stuff? loop?
+	/* poll ?  wait for other stuff? loop? */
 	tok = __KOLAB_camel_imapx_stream_token (is->stream, &token, &len, ex);
 	if (camel_exception_is_set (ex))
 		return;
@@ -1782,7 +1783,7 @@ imapx_run_job (CamelIMAPXServer *is, CamelIMAPXJob *job)
 }
 
 /* ********************************************************************** */
-// IDLE support
+/* IDLE support */
 
 
 /*TODO handle negative cases sanely */
@@ -2063,7 +2064,7 @@ imapx_idle_supported (CamelIMAPXServer *is)
 	return (is->cinfo->capa & IMAPX_CAPABILITY_IDLE && is->use_idle);
 }
 
-// end IDLE
+/* end IDLE */
 /* ********************************************************************** */
 static void
 imapx_command_select_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
@@ -2135,7 +2136,7 @@ imapx_command_select_done (CamelIMAPXServer *is, CamelIMAPXCommand *ic)
 			imapx_server_fetch_new_messages (is, is->select_pending, TRUE, TRUE, NULL);
 			/* We don't do this right now because we want the new messages to
 			   update the unseen count. */
-			//ifolder->uidnext_on_server = is->uidnext;
+			/* ifolder->uidnext_on_server = is->uidnext; */
 		}
 		ifolder->uidvalidity_on_server = is->uidvalidity;
 #if 0
@@ -2483,7 +2484,7 @@ __KOLAB_imapx_connect_to_server (CamelIMAPXServer *is, CamelException *ex)
 
  connected:
 	while (1) {
-		// poll ?  wait for other stuff? loop?
+		/* poll ?  wait for other stuff? loop? */
 		if (camel_application_is_exiting || is->parser_quit) {
 			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
 					     "Connection to server cancelled\n");
@@ -4377,7 +4378,7 @@ imapx_server_class_init(CamelIMAPXServerClass *ieclass)
 {
 	ieclass->tagprefix = 'A';
 
-//	camel_object_class_add_event((CamelObjectClass *)ieclass, "status", NULL);
+	/* camel_object_class_add_event((CamelObjectClass *)ieclass, "status", NULL); */
 }
 
 static void
@@ -5569,7 +5570,7 @@ camel_imapx_server_untagged_list (CamelIMAPXServer *imap,
 	struct _list_info *linfo = __KOLAB_imapx_parse_list(imap->stream, ex);
 	CamelIMAPXJob *job = imapx_match_active_job(imap, IMAPX_JOB_LIST, linfo->name);
 
-	// TODO: we want to make sure the names match?
+	/* TODO: we want to make sure the names match? */
 
 	if (job->u.list.flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED) {
 		c(printf("lsub: '%s' (%c)\n", linfo->name, linfo->separator));
diff --git a/src/camel/providers/imapx/camel-imapx-summary.c b/src/camel/providers/imapx/camel-imapx-summary.c
index bb20bb8..9520dd7 100644
--- a/src/camel/providers/imapx/camel-imapx-summary.c
+++ b/src/camel/providers/imapx/camel-imapx-summary.c
@@ -51,7 +51,7 @@
 #include <camel/camel-store.h>
 
 #include "camel-imapx-summary.h"
-//#include "camel-imap-utils.h"
+/* #include "camel-imap-utils.h" */
 
 #define CAMEL_IMAPX_SUMMARY_VERSION (4)
 
diff --git a/src/camel/providers/imapx/camel-imapx-summary.h b/src/camel/providers/imapx/camel-imapx-summary.h
index 6e46f0f..69882f9 100644
--- a/src/camel/providers/imapx/camel-imapx-summary.h
+++ b/src/camel/providers/imapx/camel-imapx-summary.h
@@ -37,7 +37,7 @@
 #ifndef _CAMEL_IMAPX_SUMMARY_H
 #define _CAMEL_IMAPX_SUMMARY_H
 
-//#include "camel-imap-types.h"
+/* #include "camel-imap-types.h" */
 #include <camel/camel-folder-summary.h>
 #include <camel/camel-exception.h>
 
diff --git a/src/camel/providers/imapx/camel-imapx-utils.c b/src/camel/providers/imapx/camel-imapx-utils.c
index a1aee9b..65bbfd3 100644
--- a/src/camel/providers/imapx/camel-imapx-utils.c
+++ b/src/camel/providers/imapx/camel-imapx-utils.c
@@ -1224,7 +1224,7 @@ __KOLAB_imapx_parse_body(CamelIMAPXStream *is, CamelException *ex)
 			/* what do we do with the envelope?? */
 			minfo = __KOLAB_imapx_parse_envelope(is, ex);
 			/* what do we do with the message content info?? */
-			//((CamelMessageInfoBase *)minfo)->content = imapx_parse_body(is);
+			/* ((CamelMessageInfoBase *)minfo)->content = imapx_parse_body(is); */
 			camel_message_info_free(minfo);
 			minfo = NULL;
 			d(printf("Scanned envelope - what do i do with it?\n"));
@@ -1442,7 +1442,7 @@ __KOLAB_imapx_dump_fetch(struct _fetch_info *finfo)
 	}
 	if (finfo->cinfo) {
 		camel_stream_printf(sout, "Content Info:\n");
-		//camel_content_info_dump(finfo->cinfo, 0);
+		/* camel_content_info_dump(finfo->cinfo, 0); */
 	}
 	if (finfo->got & FETCH_SIZE)
 		camel_stream_printf(sout, "Size: %d\n", (gint)finfo->size);