temporarily reverting my camel namespace patches until after we merge in some of the other branches

svn path=/trunk/; revision=22373

17 files changed, 106 insertions, 109 deletions

diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 4db0c7a43f..be3e29f16b 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -1673,7 +1673,7 @@ content_info_get_part_spec (CamelMessageContentInfo *ci)
 		CamelMessageContentInfo *child;
 		
 		/* FIXME: is this only supposed to apply if 'node' is a multipart? */
-		if (node->parent->parent && camel_content_type_is (node->parent->type, "message", "*")) {
+		if (node->parent->parent && header_content_type_is (node->parent->type, "message", "*")) {
 			node = node->parent;
 			continue;
 		}
@@ -1721,7 +1721,7 @@ get_content (CamelImapFolder *imap_folder, const char *uid,
 	part_spec = content_info_get_part_spec (ci);
 	
 	/* There are three cases: multipart/signed, multipart, message/rfc822, and "other" */
-	if (camel_content_type_is (ci->type, "multipart", "signed")) {
+	if (header_content_type_is (ci->type, "multipart", "signed")) {
 		CamelMultipartSigned *body_mp;
 		char *spec;
 		int ret;
@@ -1749,12 +1749,12 @@ get_content (CamelImapFolder *imap_folder, const char *uid,
 		}
 		
 		return (CamelDataWrapper *) body_mp;
-	} else if (camel_content_type_is (ci->type, "multipart", "*")) {
+	} else if (header_content_type_is (ci->type, "multipart", "*")) {
 		CamelMultipart *body_mp;
 		char *child_spec;
 		int speclen, num;
 		
-		if (camel_content_type_is (ci->type, "multipart", "encrypted"))
+		if (header_content_type_is (ci->type, "multipart", "encrypted"))
 			body_mp = (CamelMultipart *) camel_multipart_encrypted_new ();
 		else
 			body_mp = camel_multipart_new ();
@@ -1808,7 +1808,7 @@ get_content (CamelImapFolder *imap_folder, const char *uid,
 		g_free (child_spec);
 		
 		return (CamelDataWrapper *) body_mp;
-	} else if (camel_content_type_is (ci->type, "message", "rfc822")) {
+	} else if (header_content_type_is (ci->type, "message", "rfc822")) {
 		content = (CamelDataWrapper *) get_message (imap_folder, uid, part_spec, ci->childs, ex);
 		g_free (part_spec);
 		return content;
diff --git a/camel/providers/imap/camel-imap-store-summary.c b/camel/providers/imap/camel-imap-store-summary.c
index 32530d3c3f..d08fd9b66d 100644
--- a/camel/providers/imap/camel-imap-store-summary.c
+++ b/camel/providers/imap/camel-imap-store-summary.c
@@ -1,4 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
  * Copyright (C) 2002 Ximian Inc.
  *
diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c
index 00115203f5..26a085739f 100644
--- a/camel/providers/imap/camel-imap-utils.c
+++ b/camel/providers/imap/camel-imap-utils.c
@@ -751,7 +751,7 @@ parse_params (const char **parms_p, CamelContentType *type)
 		value = imap_parse_nstring (&parms, &len);
 		
 		if (name && value)
-			camel_content_type_set_param (type, name, value);
+			header_content_type_set_param (type, name, value);
 		g_free (name);
 		g_free (value);
 		
@@ -814,11 +814,11 @@ imap_body_decode (const char **in, CamelMessageContentInfo *ci, CamelFolder *fol
 			inptr += 3;
 		}
 		
-		ctype = camel_content_type_new ("multipart", subtype ? subtype : "mixed");
+		ctype = header_content_type_new ("multipart", subtype ? subtype : "mixed");
 		g_free (subtype);
 		
 		if (*inptr++ != ')') {
-			camel_content_type_unref (ctype);
+			header_content_type_unref (ctype);
 			return NULL;
 		}
 		
@@ -855,7 +855,7 @@ imap_body_decode (const char **in, CamelMessageContentInfo *ci, CamelFolder *fol
 		
 		camel_strdown (type);
 		camel_strdown (subtype);
-		ctype = camel_content_type_new (type, subtype);
+		ctype = header_content_type_new (type, subtype);
 		g_free (subtype);
 		g_free (type);
 		
@@ -906,7 +906,7 @@ imap_body_decode (const char **in, CamelMessageContentInfo *ci, CamelFolder *fol
 		size = strtoul ((const char *) inptr, &p, 10);
 		inptr = (const unsigned char *) p;
 		
-		if (camel_content_type_is (ctype, "message", "rfc822")) {
+		if (header_content_type_is (ctype, "message", "rfc822")) {
 			/* body_type_msg */
 			if (*inptr++ != ' ')
 				goto exception;
@@ -928,7 +928,7 @@ imap_body_decode (const char **in, CamelMessageContentInfo *ci, CamelFolder *fol
 			/* lines */
 			strtoul ((const char *) inptr, &p, 10);
 			inptr = (const unsigned char *) p;
-		} else if (camel_content_type_is (ctype, "text", "*")) {
+		} else if (header_content_type_is (ctype, "text", "*")) {
 			if (*inptr++ != ' ')
 				goto exception;
 			
@@ -956,7 +956,7 @@ imap_body_decode (const char **in, CamelMessageContentInfo *ci, CamelFolder *fol
 	
  exception:
 	
-	camel_content_type_unref (ctype);
+	header_content_type_unref (ctype);
 	g_free (id);
 	g_free (description);
 	g_free (encoding);
diff --git a/camel/providers/imapp/camel-imapp-utils.c b/camel/providers/imapp/camel-imapp-utils.c
index dcbc362554..57935a81e8 100644
--- a/camel/providers/imapp/camel-imapp-utils.c
+++ b/camel/providers/imapp/camel-imapp-utils.c
@@ -318,7 +318,7 @@ media_text      ::= <"> "TEXT" <"> SPACE media_subtype
 
 /*
 struct _body_fields {
-	CamelContentType *ct;
+	struct _header_content_type *ct;
 	char *msgid, *desc;
 	CamelMimePartEncodingType encoding;
 	guint32 size;
@@ -337,7 +337,7 @@ imap_free_body(struct _CamelMessageContentInfo *cinfo)
 	}
 	
 	if (cinfo->type)
-		camel_content_type_unref(cinfo->type);
+		header_content_type_unref(cinfo->type);
 	g_free(cinfo->id);
 	g_free(cinfo->description);
 	g_free(cinfo->encoding);
@@ -345,7 +345,7 @@ imap_free_body(struct _CamelMessageContentInfo *cinfo)
 }
 
 void
-imap_parse_param_list(CamelIMAPPStream *is, struct _camel_header_param **plist)
+imap_parse_param_list(CamelIMAPPStream *is, struct _header_param **plist)
 {
 	int tok, len;
 	unsigned char *token, *param;
@@ -365,17 +365,17 @@ imap_parse_param_list(CamelIMAPPStream *is, struct _camel_header_param **plist)
 			param = alloca(strlen(token)+1);
 			strcpy(param, token);
 			camel_imapp_stream_astring(is, &token);
-			camel_header_set_param(plist, param, token);
+			header_set_param(plist, param, token);
 		}
 	} /* else check nil?  no need */
 }
 
-struct _CamelContentDisposition *
+struct _CamelMimeDisposition *
 imap_parse_ext_optional(CamelIMAPPStream *is)
 {
 	int tok, len;
 	unsigned char *token;
-	struct _CamelContentDisposition * volatile dinfo = NULL;
+	struct _CamelMimeDisposition * volatile dinfo = NULL;
 
 	/* this parses both extension types, from the body_fld_dsp onwards */
 	/* although the grammars are different, they can be parsed the same way */
@@ -448,7 +448,7 @@ imap_parse_ext_optional(CamelIMAPPStream *is)
 		}
 	} CAMEL_CATCH(ex) {
 		if (dinfo)
-			camel_content_disposition_unref(dinfo);
+			header_disposition_unref(dinfo);
 		camel_exception_throw_ex(ex);
 	} CAMEL_DONE;
 
@@ -475,7 +475,7 @@ imap_parse_body_fields(CamelIMAPPStream *is)
 		type = alloca(strlen(token)+1);
 		strcpy(type, token);
 		camel_imapp_stream_astring(is, &token);
-		cinfo->type = camel_content_type_new(type, token);
+		cinfo->type = header_content_type_new(type, token);
 		imap_parse_param_list(is, &cinfo->type->params);
 	
 		/* body_fld_id     ::= nstring */
@@ -501,13 +501,13 @@ imap_parse_body_fields(CamelIMAPPStream *is)
 	return cinfo;
 }
 
-struct _camel_header_address *
+struct _header_address *
 imap_parse_address_list(CamelIMAPPStream *is)
 /* throws PARSE,IO exception */
 {
 	int tok, len;
 	unsigned char *token, *host, *mbox;
-	struct _camel_header_address *list = NULL;
+	struct _header_address *list = NULL;
 
 	/* "(" 1*address ")" / nil */
 
@@ -515,7 +515,7 @@ imap_parse_address_list(CamelIMAPPStream *is)
 		tok = camel_imapp_stream_token(is, &token, &len);
 		if (tok == '(') {
 			while (1) {
-				struct _camel_header_address *addr, *group = NULL;
+				struct _header_address *addr, *group = NULL;
 
 				/* address         ::= "(" addr_name SPACE addr_adl SPACE addr_mailbox
 				   SPACE addr_host ")" */
@@ -525,7 +525,7 @@ imap_parse_address_list(CamelIMAPPStream *is)
 				if (tok != '(')
 					camel_exception_throw(1, "missing '(' for address");
 
-				addr = camel_header_address_new();
+				addr = header_address_new();
 				addr->type = HEADER_ADDRESS_NAME;
 				tok = camel_imapp_stream_nstring(is, &token);
 				addr->name = g_strdup(token);
@@ -551,7 +551,7 @@ imap_parse_address_list(CamelIMAPPStream *is)
 						g_free(addr->name);
 						addr->name = mbox;
 						addr->type = HEADER_ADDRESS_GROUP;
-						camel_header_address_list_append(&list, addr);
+						header_address_list_append(&list, addr);
 						group = addr;
 					}
 				} else {
@@ -559,9 +559,9 @@ imap_parse_address_list(CamelIMAPPStream *is)
 					g_free(mbox);
 					d(printf("adding address '%s'\n", addr->v.addr));
 					if (group != NULL)
-						camel_header_address_add_member(group, addr);
+						header_address_add_member(group, addr);
 					else
-						camel_header_address_list_append(&list, addr);
+						header_address_list_append(&list, addr);
 				}
 				do {
 					tok = camel_imapp_stream_token(is, &token, &len);
@@ -571,7 +571,7 @@ imap_parse_address_list(CamelIMAPPStream *is)
 			d(printf("empty, nil '%s'\n", token));
 		}
 	} CAMEL_CATCH(ex) {
-		camel_header_address_list_clear(&list);
+		header_address_list_clear(&list);
 		camel_exception_throw_ex(ex);
 	} CAMEL_DONE;
 
@@ -583,7 +583,7 @@ imap_parse_envelope(CamelIMAPPStream *is)
 {
 	int tok, len;
 	unsigned char *token;
-	struct _camel_header_address *addr, *addr_from;
+	struct _header_address *addr, *addr_from;
 	char *addrstr;
 	struct _CamelMessageInfo *minfo;
 
@@ -603,7 +603,7 @@ imap_parse_envelope(CamelIMAPPStream *is)
 
 		/* env_date        ::= nstring */
 		camel_imapp_stream_nstring(is, &token);
-		minfo->date_sent = camel_header_decode_date(token, NULL);
+		minfo->date_sent = header_decode_date(token, NULL);
 
 		/* env_subject     ::= nstring */
 		tok = camel_imapp_stream_nstring(is, &token);
@@ -618,10 +618,10 @@ imap_parse_envelope(CamelIMAPPStream *is)
 		/* env_sender      ::= "(" 1*address ")" / nil */
 		addr = imap_parse_address_list(is);
 		if (addr_from) {
-			camel_header_address_list_clear(&addr);
+			header_address_list_clear(&addr);
 #if 0
 			if (addr)
-				camel_header_address_list_append_list(&addr_from, &addr);
+				header_address_list_append_list(&addr_from, &addr);
 #endif
 		} else {
 			if (addr)
@@ -629,38 +629,38 @@ imap_parse_envelope(CamelIMAPPStream *is)
 		}
 
 		if (addr_from) {
-			addrstr = camel_header_address_list_format(addr_from);
+			addrstr = header_address_list_format(addr_from);
 			camel_message_info_set_from(minfo, addrstr);
-			camel_header_address_list_clear(&addr_from);
+			header_address_list_clear(&addr_from);
 		}
 
 		/* we dont keep reply_to */
 
 		/* env_reply_to    ::= "(" 1*address ")" / nil */
 		addr = imap_parse_address_list(is);
-		camel_header_address_list_clear(&addr);
+		header_address_list_clear(&addr);
 
 		/* env_to          ::= "(" 1*address ")" / nil */
 		addr = imap_parse_address_list(is);
 		if (addr) {
-			addrstr = camel_header_address_list_format(addr);
+			addrstr = header_address_list_format(addr);
 			camel_message_info_set_to(minfo, addrstr);
-			camel_header_address_list_clear(&addr);
+			header_address_list_clear(&addr);
 		}
 
 		/* env_cc          ::= "(" 1*address ")" / nil */
 		addr = imap_parse_address_list(is);
 		if (addr) {
-			addrstr = camel_header_address_list_format(addr);
+			addrstr = header_address_list_format(addr);
 			camel_message_info_set_cc(minfo, addrstr);
-			camel_header_address_list_clear(&addr);
+			header_address_list_clear(&addr);
 		}
 
 		/* we dont keep bcc either */
 
 		/* env_bcc         ::= "(" 1*address ")" / nil */
 		addr = imap_parse_address_list(is);
-		camel_header_address_list_clear(&addr);
+		header_address_list_clear(&addr);
 
 		/* FIXME: need to put in-reply-to into references hash list */
 
@@ -690,7 +690,7 @@ imap_parse_body(CamelIMAPPStream *is)
 	unsigned char *token;
 	struct _CamelMessageContentInfo * volatile cinfo = NULL;
 	struct _CamelMessageContentInfo *subinfo, *last;
-	struct _CamelContentDisposition * volatile dinfo = NULL;
+	struct _CamelMimeDisposition * volatile dinfo = NULL;
 	struct _CamelMessageInfo * volatile minfo = NULL;
 
 	/* body            ::= "(" body_type_1part / body_type_mpart ")" */
@@ -723,7 +723,7 @@ imap_parse_body(CamelIMAPPStream *is)
 			d(printf("media_subtype\n"));
 
 			camel_imapp_stream_astring(is, &token);
-			cinfo->type = camel_content_type_new("multipart", token);
+			cinfo->type = header_content_type_new("multipart", token);
 
 			/* body_ext_mpart  ::= body_fld_param
 			   [SPACE body_fld_dsp SPACE body_fld_lang
@@ -822,7 +822,7 @@ imap_parse_body(CamelIMAPPStream *is)
 		if (cinfo)
 			imap_free_body(cinfo);
 		if (dinfo)
-			camel_content_disposition_unref(dinfo);
+			header_disposition_unref(dinfo);
 		if (minfo)
 			camel_message_info_free(minfo);
 		camel_exception_throw_ex(ex);
@@ -830,7 +830,7 @@ imap_parse_body(CamelIMAPPStream *is)
 
 	/* FIXME: do something with the disposition, currently we have no way to pass it out? */
 	if (dinfo)
-		camel_content_disposition_unref(dinfo);
+		header_disposition_unref(dinfo);
 
 	return cinfo;
 }
diff --git a/camel/providers/imapp/camel-imapp-utils.h b/camel/providers/imapp/camel-imapp-utils.h
index e0974bdc96..76ec178b63 100644
--- a/camel/providers/imapp/camel-imapp-utils.h
+++ b/camel/providers/imapp/camel-imapp-utils.h
@@ -48,10 +48,10 @@ void imap_parse_flags(CamelIMAPPStream *stream, guint32 *flagsp) /* IO,PARSE */;
 void imap_write_flags(CamelStream *stream, guint32 flags) /* IO */;
 
 /* ********************************************************************** */
-void imap_parse_param_list(CamelIMAPPStream *is, struct _camel_header_param **plist) /* IO,PARSE */;
-struct _CamelContentDisposition *imap_parse_ext_optional(CamelIMAPPStream *is) /* IO,PARSE */;
+void imap_parse_param_list(CamelIMAPPStream *is, struct _header_param **plist) /* IO,PARSE */;
+struct _CamelMimeDisposition *imap_parse_ext_optional(CamelIMAPPStream *is) /* IO,PARSE */;
 struct _CamelMessageContentInfo *imap_parse_body_fields(CamelIMAPPStream *is) /* IO,PARSE */;
-struct _camel_header_address *imap_parse_address_list(CamelIMAPPStream *is) /* IO,PARSE */;
+struct _header_address *imap_parse_address_list(CamelIMAPPStream *is) /* IO,PARSE */;
 struct _CamelMessageInfo *imap_parse_envelope(CamelIMAPPStream *is) /* IO, PARSE */;
 struct _CamelMessageContentInfo *imap_parse_body(CamelIMAPPStream *is) /* IO,PARSE */;
 char *imap_parse_section(CamelIMAPPStream *is) /* IO,PARSE */;
diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 42534b361d..807b04e4b0 100644
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -41,7 +41,7 @@
 
 #define CAMEL_LOCAL_SUMMARY_VERSION (0x200)
 
-static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _camel_header_raw *);
+static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *);
 
 static int local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi);
 static char *local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi);
@@ -192,8 +192,8 @@ do_stat_ci(CamelLocalSummary *cls, struct _stat_info *info, CamelMessageContentI
 	if (ci->encoding)
 		info->citotal += strlen(ci->encoding) + 4;
 	if (ci->type) {
-		CamelContentType *ct = ci->type;
-		struct _camel_header_param *param;
+		struct _header_content_type *ct = ci->type;
+		struct _header_param *param;
 
 		info->citotal += sizeof(*ct) + 4;
 		if (ct->type)
@@ -308,7 +308,7 @@ camel_local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const Cam
  * Return value: -1 on error, otherwise the number of bytes written.
  **/
 int
-camel_local_summary_write_headers(int fd, struct _camel_header_raw *header, const char *xevline, const char *status, const char *xstatus)
+camel_local_summary_write_headers(int fd, struct _header_raw *header, const char *xevline, const char *status, const char *xstatus)
 {
 	int outlen = 0, len;
 	int newfd;
@@ -463,7 +463,7 @@ static char *
 local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo *mi)
 {
 	GString *out = g_string_new("");
-	struct _camel_header_param *params = NULL;
+	struct _header_param *params = NULL;
 	GString *val = g_string_new("");
 	CamelFlag *flag = mi->user_flags;
 	CamelTag *tag = mi->user_tags;
@@ -492,7 +492,7 @@ local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo
 					g_string_append_c (val, ',');
 				flag = flag->next;
 			}
-			camel_header_set_param (&params, "flags", val->str);
+			header_set_param (&params, "flags", val->str);
 			g_string_truncate (val, 0);
 		}
 		if (tag) {
@@ -504,11 +504,11 @@ local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo
 					g_string_append_c (val, ',');
 				tag = tag->next;
 			}
-			camel_header_set_param (&params, "tags", val->str);
+			header_set_param (&params, "tags", val->str);
 		}
 		g_string_free (val, TRUE);
-		camel_header_param_list_format_append (out, params);
-		camel_header_param_list_free (params);
+		header_param_list_format_append (out, params);
+		header_param_list_free (params);
 	}
 	ret = out->str;
 	g_string_free (out, FALSE);
@@ -519,13 +519,13 @@ local_summary_encode_x_evolution(CamelLocalSummary *cls, const CamelMessageInfo
 static int
 local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *mi)
 {
-	struct _camel_header_param *params, *scan;
+	struct _header_param *params, *scan;
 	guint32 uid, flags;
 	char *header;
 	int i;
 
 	/* check for uid/flags */
-	header = camel_header_token_decode(xev);
+	header = header_token_decode(xev);
 	if (header && strlen(header) == strlen("00000000-0000")
 	    && sscanf(header, "%08x-%04x", &uid, &flags) == 2) {
 		char uidstr[20];
@@ -546,7 +546,7 @@ local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelM
 	/* check for additional data */	
 	header = strchr(xev, ';');
 	if (header) {
-		params = camel_header_param_list_decode(header+1);
+		params = header_param_list_decode(header+1);
 		scan = params;
 		while (scan) {
 			if (!strcasecmp(scan->name, "flags")) {
@@ -572,13 +572,13 @@ local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelM
 			}
 			scan = scan->next;
 		}
-		camel_header_param_list_free(params);
+		header_param_list_free(params);
 	}
 	return 0;
 }
 
 static CamelMessageInfo *
-message_info_new(CamelFolderSummary *s, struct _camel_header_raw *h)
+message_info_new(CamelFolderSummary *s, struct _header_raw *h)
 {
 	CamelMessageInfo *mi;
 	CamelLocalSummary *cls = (CamelLocalSummary *)s;
@@ -588,7 +588,7 @@ message_info_new(CamelFolderSummary *s, struct _camel_header_raw *h)
 		const char *xev;
 		int doindex = FALSE;
 
-		xev = camel_header_raw_find(&h, "X-Evolution", NULL);
+		xev = header_raw_find(&h, "X-Evolution", NULL);
 		if (xev==NULL || camel_local_summary_decode_x_evolution(cls, xev, mi) == -1) {
 			/* to indicate it has no xev header */
 			mi->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_MESSAGE_FOLDER_NOXEV;
diff --git a/camel/providers/local/camel-local-summary.h b/camel/providers/local/camel-local-summary.h
index 25d77e62c3..0995331ab1 100644
--- a/camel/providers/local/camel-local-summary.h
+++ b/camel/providers/local/camel-local-summary.h
@@ -82,7 +82,7 @@ char *camel_local_summary_encode_x_evolution(CamelLocalSummary *cls, const Camel
 int camel_local_summary_decode_x_evolution(CamelLocalSummary *cls, const char *xev, CamelMessageInfo *info);
 
 /* utility functions - write headers to a file with optional X-Evolution header and/or status header */
-int camel_local_summary_write_headers(int fd, struct _camel_header_raw *header, const char *xevline, const char *status, const char *xstatus);
+int camel_local_summary_write_headers(int fd, struct _header_raw *header, const char *xevline, const char *status, const char *xstatus);
 
 #endif /* ! _CAMEL_LOCAL_SUMMARY_H */
 
diff --git a/camel/providers/local/camel-maildir-summary.c b/camel/providers/local/camel-maildir-summary.c
index 37e1ac2ce7..2075694f63 100644
--- a/camel/providers/local/camel-maildir-summary.c
+++ b/camel/providers/local/camel-maildir-summary.c
@@ -48,7 +48,7 @@
 #define CAMEL_MAILDIR_SUMMARY_VERSION (0x2000)
 
 static CamelMessageInfo *message_info_load(CamelFolderSummary *s, FILE *in);
-static CamelMessageInfo *message_info_new(CamelFolderSummary *, struct _camel_header_raw *);
+static CamelMessageInfo *message_info_new(CamelFolderSummary *, struct _header_raw *);
 static void message_info_free(CamelFolderSummary *, CamelMessageInfo *mi);
 
 static int maildir_summary_load(CamelLocalSummary *cls, int forceindex, CamelException *ex);
@@ -256,7 +256,7 @@ static CamelMessageInfo *maildir_summary_add(CamelLocalSummary *cls, CamelMimeMe
 	return mi;
 }
 
-static CamelMessageInfo *message_info_new(CamelFolderSummary * s, struct _camel_header_raw *h)
+static CamelMessageInfo *message_info_new(CamelFolderSummary * s, struct _header_raw *h)
 {
 	CamelMessageInfo *mi, *info;
 	CamelMaildirSummary *mds = (CamelMaildirSummary *)s;
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 01c3d7811e..942610d5a9 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -376,7 +376,7 @@ retry:
 	camel_mime_parser_scan_from(parser, TRUE);
 
 	camel_mime_parser_seek(parser, frompos, SEEK_SET);
-	if (camel_mime_parser_step(parser, NULL, NULL) != CAMEL_MIME_PARSER_STATE_FROM
+	if (camel_mime_parser_step(parser, NULL, NULL) != HSCAN_FROM
 	    || camel_mime_parser_tell_start_from(parser) != frompos) {
 
 		g_warning("Summary doesn't match the folder contents!  eek!\n"
diff --git a/camel/providers/local/camel-mbox-summary.c b/camel/providers/local/camel-mbox-summary.c
index 4018fc93c9..88d2a3e9a7 100644
--- a/camel/providers/local/camel-mbox-summary.c
+++ b/camel/providers/local/camel-mbox-summary.c
@@ -49,7 +49,7 @@
 static int summary_header_load (CamelFolderSummary *, FILE *);
 static int summary_header_save (CamelFolderSummary *, FILE *);
 
-static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _camel_header_raw *);
+static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *);
 static CamelMessageInfo * message_info_new_from_parser (CamelFolderSummary *, CamelMimeParser *);
 static CamelMessageInfo * message_info_load (CamelFolderSummary *, FILE *);
 static int		  message_info_save (CamelFolderSummary *, FILE *, CamelMessageInfo *);
@@ -187,7 +187,7 @@ summary_header_save(CamelFolderSummary *s, FILE *out)
 }
 
 static CamelMessageInfo *
-message_info_new(CamelFolderSummary *s, struct _camel_header_raw *h)
+message_info_new(CamelFolderSummary *s, struct _header_raw *h)
 {
 	CamelMessageInfo *mi;
 	CamelMboxSummary *mbs = (CamelMboxSummary *)s;
@@ -204,16 +204,16 @@ message_info_new(CamelFolderSummary *s, struct _camel_header_raw *h)
 
 		if (mbs->xstatus) {
 			/* check for existance of status & x-status headers */
-			status = camel_header_raw_find(&h, "Status", NULL);
+			status = header_raw_find(&h, "Status", NULL);
 			if (status)
 				flags = decode_status(status);
-			xstatus = camel_header_raw_find(&h, "X-Status", NULL);
+			xstatus = header_raw_find(&h, "X-Status", NULL);
 			if (xstatus)
 				flags |= decode_status(xstatus);
 		}
 #endif
 		/* if we have an xev header, use it, else assign a new one */
-		xev = camel_header_raw_find(&h, "X-Evolution", NULL);
+		xev = header_raw_find(&h, "X-Evolution", NULL);
 		if (xev != NULL
 		    && camel_local_summary_decode_x_evolution((CamelLocalSummary *)s, xev, mi) == 0) {
 			uid = camel_message_info_uid(mi);
@@ -355,7 +355,7 @@ summary_update(CamelLocalSummary *cls, off_t offset, CamelFolderChangeInfo *chan
 	camel_mime_parser_seek(mp, offset, SEEK_SET);
 
 	if (offset > 0) {
-		if (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM
+		if (camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM
 		    && camel_mime_parser_tell_start_from(mp) == offset) {
 			camel_mime_parser_unstep(mp);
 		} else {
@@ -380,7 +380,7 @@ summary_update(CamelLocalSummary *cls, off_t offset, CamelFolderChangeInfo *chan
 	}
 	mbs->changes = changeinfo;
 
-	while (camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM) {
+	while (camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM) {
 		CamelMessageInfo *info;
 		off_t pc = camel_mime_parser_tell_start_from (mp) + 1;
 		
@@ -394,7 +394,7 @@ summary_update(CamelLocalSummary *cls, off_t offset, CamelFolderChangeInfo *chan
 			break;
 		}
 
-		g_assert(camel_mime_parser_step(mp, NULL, NULL) == CAMEL_MIME_PARSER_STATE_FROM_END);
+		g_assert(camel_mime_parser_step(mp, NULL, NULL) == HSCAN_FROM_END);
 	}
 
 	camel_object_unref(CAMEL_OBJECT (mp));
@@ -638,7 +638,7 @@ mbox_summary_sync_quick(CamelMboxSummary *mbs, gboolean expunge, CamelFolderChan
 
 		camel_mime_parser_seek(mp, info->frompos, SEEK_SET);
 
-		if (camel_mime_parser_step(mp, 0, 0) != CAMEL_MIME_PARSER_STATE_FROM) {
+		if (camel_mime_parser_step(mp, 0, 0) != HSCAN_FROM) {
 			g_warning("Expected a From line here, didn't get it");
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
 					     _("Summary and folder mismatch, even after a sync"));
@@ -653,7 +653,7 @@ mbox_summary_sync_quick(CamelMboxSummary *mbs, gboolean expunge, CamelFolderChan
 			goto error;
 		}
 
-		if (camel_mime_parser_step(mp, 0, 0) == CAMEL_MIME_PARSER_STATE_FROM_END) {
+		if (camel_mime_parser_step(mp, 0, 0) == HSCAN_FROM_END) {
 			g_warning("camel_mime_parser_step failed (2)");
 			goto error;
 		}
@@ -667,7 +667,7 @@ mbox_summary_sync_quick(CamelMboxSummary *mbs, gboolean expunge, CamelFolderChan
 		/* SIGH: encode_param_list is about the only function which folds headers by itself.
 		   This should be fixed somehow differently (either parser doesn't fold headers,
 		   or param_list doesn't, or something */
-		xevtmp = camel_header_unfold(xevnew);
+		xevtmp = header_unfold(xevnew);
 		/* the raw header contains a leading ' ', so (dis)count that too */
 		if (strlen(xev)-1 != strlen(xevtmp)) {
 			printf ("strlen(xev)-1 = %d; strlen(xevtmp) = %d\n", strlen(xev)-1, strlen(xevtmp));
@@ -839,7 +839,7 @@ camel_mbox_summary_sync_mbox(CamelMboxSummary *cls, guint32 flags, CamelFolderCh
 			camel_mime_parser_seek(mp, info->frompos, SEEK_SET);
 		}
 
-		if (camel_mime_parser_step(mp, &buffer, &len) != CAMEL_MIME_PARSER_STATE_FROM) {
+		if (camel_mime_parser_step(mp, &buffer, &len) != HSCAN_FROM) {
 			g_warning("Expected a From line here, didn't get it");
 			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
 					     _("Summary and folder mismatch, even after a sync"));
@@ -885,7 +885,7 @@ camel_mbox_summary_sync_mbox(CamelMboxSummary *cls, guint32 flags, CamelFolderCh
 		if (info && info->info.flags & (CAMEL_MESSAGE_FOLDER_NOXEV | CAMEL_MESSAGE_FOLDER_FLAGGED)) {
 			d(printf("Updating header for %s flags = %08x\n", camel_message_info_uid(info), info->info.flags));
 
-			if (camel_mime_parser_step(mp, &buffer, &len) == CAMEL_MIME_PARSER_STATE_FROM_END) {
+			if (camel_mime_parser_step(mp, &buffer, &len) == HSCAN_FROM_END) {
 				g_warning("camel_mime_parser_step failed (2)");
 				goto error;
 			}
@@ -918,7 +918,7 @@ camel_mbox_summary_sync_mbox(CamelMboxSummary *cls, guint32 flags, CamelFolderCh
 		camel_mime_parser_drop_step(mp);
 		if (info) {
 			d(printf("looking for message content to copy across from %d\n", (int)camel_mime_parser_tell(mp)));
-			while (camel_mime_parser_step(mp, &buffer, &len) == CAMEL_MIME_PARSER_STATE_PRE_FROM) {
+			while (camel_mime_parser_step(mp, &buffer, &len) == HSCAN_PRE_FROM) {
 				/*d(printf("copying mbox contents to tmp: '%.*s'\n", len, buffer));*/
 				if (write(fdout, buffer, len) != len) {
 					camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
diff --git a/camel/providers/local/camel-mh-summary.c b/camel/providers/local/camel-mh-summary.c
index 5dd26ac9ba..25794fa258 100644
--- a/camel/providers/local/camel-mh-summary.c
+++ b/camel/providers/local/camel-mh-summary.c
@@ -314,7 +314,7 @@ mh_summary_sync_message(CamelLocalSummary *cls, CamelMessageInfo *info, CamelExc
 
 	mp = camel_mime_parser_new();
 	camel_mime_parser_init_with_fd(mp, fd);
-	if (camel_mime_parser_step(mp, 0, 0) != CAMEL_MIME_PARSER_STATE_EOF) {
+	if (camel_mime_parser_step(mp, 0, 0) != HSCAN_EOF) {
 		xev = camel_mime_parser_header(mp, "X-Evolution", &xevoffset);
 		d(printf("xev = '%s'\n", xev));
 		xevnew = camel_local_summary_encode_x_evolution(cls, info);
diff --git a/camel/providers/local/camel-spool-summary.h b/camel/providers/local/camel-spool-summary.h
index b72aeda527..7813243a69 100644
--- a/camel/providers/local/camel-spool-summary.h
+++ b/camel/providers/local/camel-spool-summary.h
@@ -63,7 +63,7 @@ char *camel_spool_summary_encode_x_evolution(CamelSpoolSummary *cls, const Camel
 int camel_spool_summary_decode_x_evolution(CamelSpoolSummary *cls, const char *xev, CamelMessageInfo *info);
 
 /* utility functions - write headers to a file with optional X-Evolution header */
-int camel_spool_summary_write_headers(int fd, struct _camel_header_raw *header, char *xevline);
+int camel_spool_summary_write_headers(int fd, struct _header_raw *header, char *xevline);
 
 #endif /* ! _CAMEL_SPOOL_SUMMARY_H */
 
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index 2a9669d697..9f6ff5f095 100644
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ b/camel/providers/nntp/camel-nntp-summary.c
@@ -77,7 +77,7 @@ struct _CamelNNTPSummaryPrivate {
 
 #define _PRIVATE(o) (((CamelNNTPSummary *)(o))->priv)
 
-static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _camel_header_raw *);
+static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _header_raw *);
 static int summary_header_load(CamelFolderSummary *, FILE *);
 static int summary_header_save(CamelFolderSummary *, FILE *);
 
@@ -165,7 +165,7 @@ camel_nntp_summary_new(CamelNNTPFolder *folder)
 }
 
 static CamelMessageInfo *
-message_info_new(CamelFolderSummary *s, struct _camel_header_raw *h)
+message_info_new(CamelFolderSummary *s, struct _header_raw *h)
 {
 	CamelMessageInfo *mi;
 	CamelNNTPSummary *cns = (CamelNNTPSummary *)s;
@@ -186,8 +186,7 @@ message_info_new(CamelFolderSummary *s, struct _camel_header_raw *h)
 	return mi;
 }
 
-static int
-summary_header_load(CamelFolderSummary *s, FILE *in)
+static int summary_header_load(CamelFolderSummary *s, FILE *in)
 {
 	CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(s);
 
@@ -199,8 +198,7 @@ summary_header_load(CamelFolderSummary *s, FILE *in)
 	return 0;
 }
 
-static int
-summary_header_save(CamelFolderSummary *s, FILE *out)
+static int summary_header_save(CamelFolderSummary *s, FILE *out)
 {
 	CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(s);
 
@@ -213,8 +211,7 @@ summary_header_save(CamelFolderSummary *s, FILE *out)
 }
 
 /* Assumes we have the stream */
-int
-camel_nntp_summary_check(CamelNNTPSummary *cns, CamelFolderChangeInfo *changes, CamelException *ex)
+int camel_nntp_summary_check(CamelNNTPSummary *cns, CamelFolderChangeInfo *changes, CamelException *ex)
 {
 	CamelNNTPStore *store;
 	CamelFolder *folder;
@@ -393,7 +390,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came
 	CamelFolder *folder;
 	CamelFolderSummary *s;
 	CamelMessageInfo *mi;
-	struct _camel_header_raw *headers = NULL;
+	struct _header_raw *headers = NULL;
 	char *line, *tab;
 	int len, ret;
 	unsigned int n, count, total, size;
@@ -436,7 +433,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came
 			if (xover->name) {
 				line += xover->skip;
 				if (line < tab) {
-					camel_header_raw_append(&headers, xover->name, line, -1);
+					header_raw_append(&headers, xover->name, line, -1);
 					switch(xover->type) {
 					case XOVER_STRING:
 						break;
@@ -471,7 +468,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came
 			cns->priv->uid = NULL;
 		}
 
-		camel_header_raw_clear(&headers);
+		header_raw_clear(&headers);
 
 		now = time(0);
 		if (last + 2 < now) {
@@ -536,7 +533,7 @@ add_range_head(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Camel
 				if (camel_mime_parser_init_with_stream(mp, (CamelStream *)store->stream) == -1)
 					goto error;
 				mi = camel_folder_summary_add_from_parser(s, mp);
-				while (camel_mime_parser_step(mp, NULL, NULL) != CAMEL_MIME_PARSER_STATE_EOF)
+				while (camel_mime_parser_step(mp, NULL, NULL) != HSCAN_EOF)
 					;
 				if (mi == NULL) {
 					goto error;
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index d8000a85ee..5f26d7100f 100644
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.c
@@ -94,7 +94,7 @@ get_XOVER_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,
 				camel_message_info_set_to(new_info, g_strdup(folder->name));
 				camel_message_info_set_uid(new_info, uid);
 
-				new_info->date_sent = camel_header_decode_date(date, NULL);
+				new_info->date_sent = header_decode_date(date, NULL);
 #if 0
 				/* XXX do we need to fill in both dates? */
 				new_info->headers.date_received = g_strdup(date);
@@ -176,8 +176,9 @@ get_HEAD_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,
 			}
 
 			/* create a stream from which to parse the headers */
-			header_stream = camel_stream_mem_new_with_buffer (buf, buf_len,
-									  CAMEL_STREAM_MEM_READ);
+			header_stream = camel_stream_mem_new_with_buffer(buf,
+								 buf_len,
+								 CAMEL_STREAM_MEM_READ);
 
 			header_array = get_header_array_from_stream (header_stream);
 
@@ -196,7 +197,7 @@ get_HEAD_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,
 					new_info->message_id = g_strdup(header->value);
 				}
 				else if (!g_strcasecmp(header->name, "Date")) {
-					new_info->date_sent = camel_header_decode_date (header->value);
+					new_info->date_sent = header_decode_date (header->value);
 #if 0
 					new_info->date_sent = g_strdup(header->value);
 					new_info->date_received = g_strdup(header->value);
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 0df4fcf5c5..a0d4ea661f 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -145,7 +145,7 @@ cmd_builduid(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data)
 	CamelPOP3FolderInfo *fi = data;
 	MD5Context md5;
 	unsigned char digest[16];
-	struct _camel_header_raw *h;
+	struct _header_raw *h;
 	CamelMimeParser *mp;
 
 	/* TODO; somehow work out the limit and use that for proper progress reporting
@@ -156,9 +156,9 @@ cmd_builduid(CamelPOP3Engine *pe, CamelPOP3Stream *stream, void *data)
 	mp = camel_mime_parser_new();
 	camel_mime_parser_init_with_stream(mp, (CamelStream *)stream);
 	switch (camel_mime_parser_step(mp, NULL, NULL)) {
-	case CAMEL_MIME_PARSER_STATE_HEADER:
-	case CAMEL_MIME_PARSER_STATE_MESSAGE:
-	case CAMEL_MIME_PARSER_STATE_MULTIPART:
+	case HSCAN_HEADER:
+	case HSCAN_MESSAGE:
+	case HSCAN_MULTIPART:
 		h = camel_mime_parser_headers_raw(mp);
 		while (h) {
 			if (strcasecmp(h->name, "status") != 0
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index fbf6f08a6b..863daf1bca 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -87,7 +87,7 @@ sendmail_send_to (CamelTransport *transport, CamelMimeMessage *message,
 		  CamelAddress *from, CamelAddress *recipients,
 		  CamelException *ex)
 {
-	struct _camel_header_raw *header, *savedbcc, *n, *tail;
+	struct _header_raw *header, *savedbcc, *n, *tail;
 	const char *from_addr, *addr, **argv;
 	int i, len, fd[2], nullfd, wstat;
 	CamelStreamFilter *filter;
@@ -122,9 +122,9 @@ sendmail_send_to (CamelTransport *transport, CamelMimeMessage *message,
 	
 	/* unlink the bcc headers */
 	savedbcc = NULL;
-	tail = (struct _camel_header_raw *) &savedbcc;
+	tail = (struct _header_raw *) &savedbcc;
 	
-	header = (struct _camel_header_raw *) &CAMEL_MIME_PART (message)->headers;
+	header = (struct _header_raw *) &CAMEL_MIME_PART (message)->headers;
 	n = header->next;
 	while (n != NULL) {
 		if (!strcasecmp (n->name, "Bcc")) {
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 107698cd52..504cbfa2b6 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -1223,7 +1223,7 @@ static gboolean
 smtp_data (CamelSmtpTransport *transport, CamelMimeMessage *message, CamelException *ex)
 {
 	CamelBestencEncoding enctype = CAMEL_BESTENC_8BIT;
-	struct _camel_header_raw *header, *savedbcc, *n, *tail;
+	struct _header_raw *header, *savedbcc, *n, *tail;
 	char *cmdbuf, *respbuf = NULL;
 	CamelStreamFilter *filtered_stream;
 	CamelMimeFilter *crlffilter;
@@ -1282,9 +1282,9 @@ smtp_data (CamelSmtpTransport *transport, CamelMimeMessage *message, CamelExcept
 	
 	/* unlink the bcc headers */
 	savedbcc = NULL;
-	tail = (struct _camel_header_raw *) &savedbcc;
+	tail = (struct _header_raw *) &savedbcc;
 	
-	header = (struct _camel_header_raw *) &CAMEL_MIME_PART (message)->headers;
+	header = (struct _header_raw *) &CAMEL_MIME_PART (message)->headers;
 	n = header->next;
 	while (n != NULL) {
 		if (!strcasecmp (n->name, "Bcc")) {