2 files changed, 15 insertions, 13 deletions

diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
index 9f6ff5f095..50486a2631 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 _header_raw *);
+static CamelMessageInfo * message_info_new (CamelFolderSummary *, struct _camel_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 _header_raw *h)
+message_info_new(CamelFolderSummary *s, struct _camel_header_raw *h)
 {
 	CamelMessageInfo *mi;
 	CamelNNTPSummary *cns = (CamelNNTPSummary *)s;
@@ -186,7 +186,8 @@ message_info_new(CamelFolderSummary *s, struct _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);
 
@@ -198,7 +199,8 @@ static int 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);
 
@@ -211,7 +213,8 @@ static int 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;
@@ -390,7 +393,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came
 	CamelFolder *folder;
 	CamelFolderSummary *s;
 	CamelMessageInfo *mi;
-	struct _header_raw *headers = NULL;
+	struct _camel_header_raw *headers = NULL;
 	char *line, *tab;
 	int len, ret;
 	unsigned int n, count, total, size;
@@ -433,7 +436,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came
 			if (xover->name) {
 				line += xover->skip;
 				if (line < tab) {
-					header_raw_append(&headers, xover->name, line, -1);
+					camel_header_raw_append(&headers, xover->name, line, -1);
 					switch(xover->type) {
 					case XOVER_STRING:
 						break;
@@ -468,7 +471,7 @@ add_range_xover(CamelNNTPSummary *cns, unsigned int high, unsigned int low, Came
 			cns->priv->uid = NULL;
 		}
 
-		header_raw_clear(&headers);
+		camel_header_raw_clear(&headers);
 
 		now = time(0);
 		if (last + 2 < now) {
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index 5f26d7100f..d8000a85ee 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 = header_decode_date(date, NULL);
+				new_info->date_sent = camel_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,9 +176,8 @@ 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);
 
@@ -197,7 +196,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 = header_decode_date (header->value);
+					new_info->date_sent = camel_header_decode_date (header->value);
 #if 0
 					new_info->date_sent = g_strdup(header->value);
 					new_info->date_received = g_strdup(header->value);