Update logs and sync home/work versions.

	* camel/camel-multipart.c (_read_part):
	use a stream to store the part instead of GString.

	* camel/camel-mime-part.c (camel_mime_part_set_text):
	set data wrapper content type to "text/plain".

	* camel/camel-stream-mem.c:
	* camel/camel-stream-mem.h:
	new memory buffer based stream.

	* camel/camel-stream-fs.c (_seek):
	implementation for file system based stream.

	* camel/camel-stream.c (camel_stream_seek):
	new method.

	* camel/camel-stream-fs.c (camel_stream_fs_class_init):
	pass CamelStreamFsClass instead of CamelStreamClass.

svn path=/trunk/; revision=1069

2 files changed, 1 insertions, 25 deletions

diff --git a/camel/camel-mime-part.c b/camel/camel-mime-part.c
index 18c8b72be1..8a3637afa7 100644
--- a/camel/camel-mime-part.c
+++ b/camel/camel-mime-part.c
@@ -796,7 +796,6 @@ camel_mime_part_set_text (CamelMimePart *camel_mime_part, gchar *text)
 	}
 	if (text) {
 		simple_data_wrapper = camel_simple_data_wrapper_new ();
-		//camel_mime_part->content = CAMEL_DATA_WRAPPER (simple_data_wrapper);
 		CAMEL_LOG_FULL_DEBUG ("CamelMimePart::set_text calling CamelSimpleDataWrapper:set_text with %d chars\n", strlen (text));
 		camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (simple_data_wrapper), "text/plain");
 		camel_simple_data_wrapper_set_text ( simple_data_wrapper, text);
diff --git a/camel/camel-multipart.c b/camel/camel-multipart.c
index cdf8ab6e0f..e0cf2861ac 100644
--- a/camel/camel-multipart.c
+++ b/camel/camel-multipart.c
@@ -385,30 +385,7 @@ _read_part (CamelStream *new_part_stream, CamelStream *stream, gchar *normal_bou
 	 * and in particular, the message could have been damaged during
 	 * transport, the parsing should be OK */
 	CAMEL_LOG_FULL_DEBUG ("CamelMultipart:: Entering _read_part\n");
-#if 0
-	do {
-		new_line = gmime_read_line_from_stream (stream);
-		printf ("++ new line = \"%s\"\n", new_line);
-		if (new_line) {
-			end_of_part = (strcmp (new_line, normal_boundary) == 0);
-			last_part   = (strcmp (new_line, end_boundary) == 0);
-			if (!end_of_part && !last_part) {
-				if (pending_crlf) {
-					new_part = g_string_append_c (new_part, '\n');
-					pending_crlf = FALSE;
-				}
-				line_length = strlen (new_line);
-				if (new_line[line_length-1]='\n') {
-					pending_crlf = TRUE;
-					new_line[line_length-1]='\0';
-				}
-				//new_part = g_string_append (new_part, new_line);
-				
-			}
-		}
-
-	} ;
-#endif
+
 	new_line = gmime_read_line_from_stream (stream);
 	printf ("== new line = \"%s\"\n", new_line);
 	while (new_line && !end_of_part && !last_part) {