Whole swag of changes. Still lots of cleanup remaining ...

2000-04-23  NotZed  <NotZed@HelixCode.com>

	* camel-data-wrapper.c (set_mime_type_field): Ref the
	content_field when we get it?

	* camel-mime-parser.c (camel_mime_parser_unstep): New function.
	Cause a subsequent call to mime_parser_step() to return the same
	state over again.

	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):
	Initial test code using the mime parser to construct the message.

	* camel-mime-part.c (construct_from_parser): part constructor.
	(camel_mime_part_construct_content): Basically a simpler
	replacement for the datawrapper repository.
	(camel_mime_part_init): Set the default type to text/plain.

	* camel-simple-data-wrapper.c (construct_from_parser): Initial
	implementation of a content constructor.

	* camel-multipart.c (construct_from_parser): Multipart
	construction routine.
	(camel_multipart_init): Set the default multipart type to
	multipart/mixed.  Duh, no subtype is not allowed anyway.

2000-04-22  NotZed  <NotZed@HelixCode.com>

	* camel-mime-message.h (struct _CamelMimeMessage): Removed
	send_date, and received_date, and replaced it with a time_t
	'date' (this is what the header is called), and date_offset to
	store the GMT offset of the date.

	* camel-mime-message.c (camel_mime_message_set_from): Update raw
	header as we go.
	(_set_from): Removed.
	(_get_from): Removed.
	(camel_mime_message_get_from): Moved implementation here.
	(camel_mime_message_get_subject): Move implementation here.
	(_get_subject): Nuked.
	(camel_mime_message_set_subject): Handle utf-8 input, and also
	update raw header when changed.
	(_set_subject): Removed.
	(_set_received_date): Removed.
	(camel_mime_message_set_received_date): Removed.
	(_get_received_date): Removed.
	(camel_mime_message_get_received_date): Removed.
	(_get_sent_date): Removed.
	(camel_mime_message_get_sent_date): Removed.
	(camel_mime_message_get_date): New function to get the date as a
	time_t/offset.
	(camel_mime_message_set_date): Set the date as a time_t/offset.
	(camel_mime_message_get_date_string): Get the date as a string.
	(camel_mime_message_init): Initialise the current date as
	'CMAEL_MESSAGE_DATE_CURRENT'.
	(_set_reply_to): Removed.
	(camel_mime_message_set_reply_to): Moved implementation here.
	This is still broken, reply-to can have multiple addresses.
	(_get_reply_to): Removed.
	(_set_field): Removed, no longer used anywhere.
	(_get_field): Also removed.
	(_init_header_name_table): Add the Date header.
	(process_header): Also handle snooping of Date header here.

	* camel-stream-filter.c (finalise): Unref the source stream on
	finalise, and also call the parent class (oops).

	* camel-mime-parser.c (camel_mime_parser_state): New function to
	get the current parser state.
	(camel_mime_parser_stream): Allow you to get the stream back from
	the mime_parser.
	(camel_mime_parser_fd): Alternative to allow you to get the fd
	back from the mime_parser.
	(folder_scan_init_with_stream): Properly ref/unref the stream.
	(folder_scan_close): Properly unref the stream/close the fd on
	exit.
	(folder_scan_init_with_fd): Close the old fd if there is one.

	* camel-data-wrapper.c (camel_data_wrapper_construct_from_parser):
	New method, construct a data wrapper from an initialised parser.
	(construct_from_parser): Empty implementation.

	* providers/mbox/camel-mbox-summary.c (message_struct_new):
	Convert subject line to unicode, before storing in the summary.
	(strdup_trim): Removed, no longer needed.

	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Ref
	the folder after setting it in the new message.

	* camel-mime-part.c (my_set_content_object): Have the headers
	follow the content-type change here too.
	(my_write_to_stream): Dont write content-type here, automatically
	stored in the headers ...
	(my_write_to_stream): Use header_disposition_format() to format
	the content-disposition header.
	(my_write_to_stream): Removed old code, all headers are now stored
	in the camel-medium level, always.  Need to do the same with
	camel-mime-message i suppose ...
	(my_write_to_stream): Write the content using the parent class,
	not some weird function.
	(camel_mime_part_class_init): Dont override get_output_stream.
	(camel_mime_part_encoding_from_string): Bleh, make it
	case-insensitive.

	* camel-mime-utils.c (header_content_type_is): Handle empty types.
	(header_encode_string): Start of an implementation of the rfc2047
	encoder.  It does iso-8859-1, and us-ascii, and utf-8 (others get
	tricky *sigh*)
	(rfc2047_encode_word): Convert a single word/string into rfc2047
	encoding.
	(quoted_encode): Different quoted-printable encoding for rfc2047
	encoding of headers.

	* gmime-content-field.c (gmime_content_field_write_to_stream): Use
	header_content_type_format() to format it.

svn path=/trunk/; revision=2560

1 files changed, 44 insertions, 16 deletions

diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index 3292e04b78..94ec8a4dbf 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -33,6 +33,7 @@
 #include "camel-mime-body-part.h"
 #include "camel-multipart.h"
 
+#define d(x)
 
 static void                  add_part          (CamelMultipart *multipart,
 						   CamelMimeBodyPart *part);
@@ -56,8 +57,9 @@ static void                  write_to_stream   (CamelDataWrapper *data_wrapper,
 						CamelStream *stream);
 static void                  set_input_stream  (CamelDataWrapper *data_wrapper,
 						CamelStream *stream);
-
 static void                  finalize          (GtkObject *object);
+static void construct_from_parser(CamelDataWrapper *dw, CamelMimeParser *mp);
+
 
 static CamelDataWrapperClass *parent_class = NULL;
 
@@ -96,6 +98,8 @@ camel_multipart_class_init (CamelMultipartClass *camel_multipart_class)
 	camel_data_wrapper_class->write_to_stream = write_to_stream;
 	camel_data_wrapper_class->set_input_stream = set_input_stream;
 
+	camel_data_wrapper_class->construct_from_parser = construct_from_parser;	
+
 	gtk_object_class->finalize = finalize;
 }
 
@@ -105,7 +109,7 @@ camel_multipart_init (gpointer object, gpointer klass)
 	CamelMultipart *multipart = CAMEL_MULTIPART (object);
 
 	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),
-					  "multipart");
+					  "multipart/mixed");
 	camel_multipart_set_boundary (multipart, "=-=-=-=");
 	multipart->preface = NULL;
 	multipart->postface = NULL;
@@ -165,6 +169,7 @@ finalize (GtkObject *object)
 }
 
 
+
 /**
  * camel_multipart_new:
  *
@@ -408,6 +413,7 @@ camel_multipart_get_parent (CamelMultipart *multipart)
 }
 
 
+
 static void
 set_boundary (CamelMultipart *multipart, gchar *boundary)
 {
@@ -629,22 +635,44 @@ set_input_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)
 		 * set_input_stream.
 		 */
 		saved_stream_pos = camel_seekable_stream_get_current_position (seekable_stream);
+		camel_data_wrapper_set_input_stream (CAMEL_DATA_WRAPPER (body_part), 
+						     CAMEL_STREAM (body_part_input_stream));
+		
+		/* restore the stream position */
+		camel_seekable_stream_seek (seekable_stream, saved_stream_pos, CAMEL_STREAM_SET);
+		
+		/* add the body part to the multipart object */
+		camel_multipart_add_part (multipart, body_part);		
+	}
+	
+	/* g_string_assign (new_part, ""); */
+	/* my_localize_part (new_part, stream, real_boundary_line, end_boundary_line); */
+	
+	if (multipart->postface) g_free (multipart->postface);
+	/* if ( (new_part->str)[0] != '\0') multipart->postface = g_strdup (new_part->str); */
+	
+	/* g_string_free (new_part, TRUE); */
+	
+	g_free (real_boundary_line);
+	g_free (end_boundary_line);
+}
 
-		camel_data_wrapper_set_input_stream (
-			CAMEL_DATA_WRAPPER (body_part),
-			CAMEL_STREAM (body_part_input_stream));
-
-		/* Restore the stream position. */
-		camel_seekable_stream_seek (seekable_stream, saved_stream_pos,
-					    CAMEL_STREAM_SET);
+/* multi_part */
+static void
+construct_from_parser(CamelDataWrapper *dw, CamelMimeParser *mp)
+{
+	CamelDataWrapper *bodypart;
+	char *buf;
+	int len;
 
-		/* Add the body part to the multipart object. */
-		camel_multipart_add_part (multipart, body_part);
-	}
+	d(printf("constructing multipart\n"));
 
-	if (multipart->postface)
-		g_free (multipart->postface);
+	/* get/set boundary? */
 
-	g_free (real_boundary_line);
-	g_free (end_boundary_line);
+	while (camel_mime_parser_step(mp, &buf, &len) != HSCAN_MULTIPART_END) {
+		camel_mime_parser_unstep(mp);
+		bodypart = (CamelDataWrapper *)camel_mime_body_part_new();
+		camel_data_wrapper_construct_from_parser(bodypart, mp);
+		camel_multipart_add_part((CamelMultipart *)dw, (CamelMimeBodyPart *)bodypart);
+	}
 }