No longer takes a 'preserve_headers' argument.

2002-04-19  Jeffrey Stedfast  <fejj@ximian.com>

	* gmime-parser.c (g_mime_parser_construct_message): No longer
	takes a 'preserve_headers' argument.

5 files changed, 17 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 9e9f66e3..a9b41c5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-19  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* gmime-parser.c (g_mime_parser_construct_message): No longer
+	takes a 'preserve_headers' argument.
+
 2002-04-18  Jeffrey Stedfast  <fejj@ximian.com>
 
 	* docs/*: Updated.
diff --git a/gmime-parser.c b/gmime-parser.c
index d8339101..7395d8a7 100644
--- a/gmime-parser.c
+++ b/gmime-parser.c
@@ -398,7 +398,7 @@ special_header (const char *header)
 }
 
 static void
-construct_message_headers (GMimeMessage *message, const char *in, int inlen, gboolean preserve_headers)
+construct_message_headers (GMimeMessage *message, const char *in, int inlen)
 {
 	char *header, *value, *raw, *q;
 	char *inptr, *inend;
@@ -469,7 +469,7 @@ construct_message_headers (GMimeMessage *message, const char *in, int inlen, gbo
 		case HEADER_UNKNOWN:
 		default:
 			/* possibly save the raw header */
-			if ((preserve_headers || headers[i]) && !special_header (header)) {
+			if (!special_header (header)) {
 				header[strlen (header) - 1] = '\0'; /* kill the ':' */
 				g_strstrip (header);
 				g_mime_header_add (message->header->headers, header, value);
@@ -491,14 +491,13 @@ construct_message_headers (GMimeMessage *message, const char *in, int inlen, gbo
 /**
  * g_mime_parser_construct_message:
  * @stream: an rfc0822 message stream
- * @preserve_headers: if %TRUE, then store the arbitrary headers
  *
  * Constructs a GMimeMessage object based on @stream.
  *
  * Returns a GMimeMessage object based on the rfc0822 message stream.
  **/
 GMimeMessage *
-g_mime_parser_construct_message (GMimeStream *stream, gboolean preserve_headers)
+g_mime_parser_construct_message (GMimeStream *stream)
 {
 	GMimeMessage *message = NULL;
 	GMimeStreamMem *mem;
@@ -529,8 +528,8 @@ g_mime_parser_construct_message (GMimeStream *stream, gboolean preserve_headers)
 	if (hdr_end != NULL) {
 		GMimePart *part;
 		
-		message = g_mime_message_new (!preserve_headers);
-		construct_message_headers (message, in, hdr_end - in, preserve_headers);
+		message = g_mime_message_new (FALSE);
+		construct_message_headers (message, in, hdr_end - in);
 		part = g_mime_parser_construct_part_internal (stream, mem);
 		g_mime_message_set_mime_part (message, part);
 		g_mime_object_unref (GMIME_OBJECT (part));
diff --git a/gmime-parser.h b/gmime-parser.h
index d8d7fc59..4a19bc70 100644
--- a/gmime-parser.h
+++ b/gmime-parser.h
@@ -34,7 +34,7 @@ extern "C" {
 
 GMimePart *g_mime_parser_construct_part (GMimeStream *stream);
 
-GMimeMessage *g_mime_parser_construct_message (GMimeStream *stream, gboolean preserve_headers);
+GMimeMessage *g_mime_parser_construct_message (GMimeStream *stream);
 
 #ifdef __cplusplus
 }
diff --git a/gmime/gmime-parser.c b/gmime/gmime-parser.c
index d8339101..7395d8a7 100644
--- a/gmime/gmime-parser.c
+++ b/gmime/gmime-parser.c
@@ -398,7 +398,7 @@ special_header (const char *header)
 }
 
 static void
-construct_message_headers (GMimeMessage *message, const char *in, int inlen, gboolean preserve_headers)
+construct_message_headers (GMimeMessage *message, const char *in, int inlen)
 {
 	char *header, *value, *raw, *q;
 	char *inptr, *inend;
@@ -469,7 +469,7 @@ construct_message_headers (GMimeMessage *message, const char *in, int inlen, gbo
 		case HEADER_UNKNOWN:
 		default:
 			/* possibly save the raw header */
-			if ((preserve_headers || headers[i]) && !special_header (header)) {
+			if (!special_header (header)) {
 				header[strlen (header) - 1] = '\0'; /* kill the ':' */
 				g_strstrip (header);
 				g_mime_header_add (message->header->headers, header, value);
@@ -491,14 +491,13 @@ construct_message_headers (GMimeMessage *message, const char *in, int inlen, gbo
 /**
  * g_mime_parser_construct_message:
  * @stream: an rfc0822 message stream
- * @preserve_headers: if %TRUE, then store the arbitrary headers
  *
  * Constructs a GMimeMessage object based on @stream.
  *
  * Returns a GMimeMessage object based on the rfc0822 message stream.
  **/
 GMimeMessage *
-g_mime_parser_construct_message (GMimeStream *stream, gboolean preserve_headers)
+g_mime_parser_construct_message (GMimeStream *stream)
 {
 	GMimeMessage *message = NULL;
 	GMimeStreamMem *mem;
@@ -529,8 +528,8 @@ g_mime_parser_construct_message (GMimeStream *stream, gboolean preserve_headers)
 	if (hdr_end != NULL) {
 		GMimePart *part;
 		
-		message = g_mime_message_new (!preserve_headers);
-		construct_message_headers (message, in, hdr_end - in, preserve_headers);
+		message = g_mime_message_new (FALSE);
+		construct_message_headers (message, in, hdr_end - in);
 		part = g_mime_parser_construct_part_internal (stream, mem);
 		g_mime_message_set_mime_part (message, part);
 		g_mime_object_unref (GMIME_OBJECT (part));
diff --git a/gmime/gmime-parser.h b/gmime/gmime-parser.h
index d8d7fc59..4a19bc70 100644
--- a/gmime/gmime-parser.h
+++ b/gmime/gmime-parser.h
@@ -34,7 +34,7 @@ extern "C" {
 
 GMimePart *g_mime_parser_construct_part (GMimeStream *stream);
 
-GMimeMessage *g_mime_parser_construct_message (GMimeStream *stream, gboolean preserve_headers);
+GMimeMessage *g_mime_parser_construct_message (GMimeStream *stream);
 
 #ifdef __cplusplus
 }