From: Philip Van Hoof <philip@codeminded.be>
Date: Sun, 13 Jan 2008 11:48:00 +0000 (+0000)
Subject: Adapted to latest Tinymail API changes
X-Git-Tag: git_migration_finished~1816
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=1b9054356e613aa2b629bf34fd21fb1fccb80956;hp=c0342fe819176fe9a3b370bdb43cb97d7d47af75

Adapted to latest Tinymail API changes

pmo-trunk-r4028
---

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 976a601..d3ff35b 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -1975,7 +1975,7 @@ modest_msg_edit_window_insert_image (ModestMsgEditWindow *window)
 				(modest_runtime_get_platform_factory ());
 				
 			TnyStream *stream = create_stream_for_uri (uri);
-			tny_mime_part_construct_from_stream (mime_part, stream, mime_type);
+			tny_mime_part_construct (mime_part, stream, mime_type, "base64");
 			
 			content_id = g_strdup_printf ("%d", priv->last_cid);
 			tny_mime_part_set_content_id (mime_part, content_id);
@@ -2076,7 +2076,7 @@ modest_msg_edit_window_attach_file_one (
 			(modest_runtime_get_platform_factory ());
 		stream = TNY_STREAM (tny_vfs_stream_new (handle));
 		
-		tny_mime_part_construct_from_stream (mime_part, stream, mime_type);
+		tny_mime_part_construct (mime_part, stream, mime_type, "base64");
 
 		g_object_unref (stream);
 		
diff --git a/src/modest-formatter.c b/src/modest-formatter.c
index 4e1e367..e54154e 100644
--- a/src/modest-formatter.c
+++ b/src/modest-formatter.c
@@ -114,7 +114,7 @@ construct_from_text (TnyMimePart *part,
 
 	/* Construct MIME part */
 	tny_stream_reset (text_body_stream);
-	tny_mime_part_construct_from_stream (part, text_body_stream, content_type);
+	tny_mime_part_construct (part, text_body_stream, content_type, "7bit");
 	tny_stream_reset (text_body_stream);
 
 	/* Clean */
diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 489697a..0152b4b 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -179,9 +179,9 @@ add_body_part (TnyMsg *msg,
 
 	/* Construct MIME part */
 	tny_stream_reset (text_body_stream);
-	tny_mime_part_construct_from_stream (text_body_part,
-					     text_body_stream,
-					     content_type);
+	tny_mime_part_construct (text_body_part,
+				 text_body_stream,
+				 content_type, "7bit");
 	tny_stream_reset (text_body_stream);
 
 	g_object_unref (G_OBJECT(text_body_part));
@@ -209,9 +209,11 @@ add_html_body_part (TnyMsg *msg,
 
 	/* Construct MIME part */
 	tny_stream_reset (html_body_stream);
-	tny_mime_part_construct_from_stream (html_body_part,
-					     html_body_stream,
-					     "text/html; charset=utf-8");
+	tny_mime_part_construct (html_body_part,
+			         html_body_stream,
+			         "text/html; charset=utf-8", 
+			         "7bit"); /* Sometimes it might be needed 
+					     to make this one a 8bit! */
 	tny_stream_reset (html_body_stream);
 
 	g_object_unref (G_OBJECT(html_body_part));
@@ -232,7 +234,8 @@ copy_mime_part (TnyMimePart *part)
 	TnyList *parts;
 	TnyIterator *iterator;
 	TnyStream *attachment_stream;
-
+	const gchar *enc;
+	
 	if (TNY_IS_MSG (part)) {
 		g_object_ref (part);
 		return part;
@@ -249,10 +252,12 @@ copy_mime_part (TnyMimePart *part)
 	
 	/* fill the stream */
  	attachment_stream = tny_mime_part_get_stream (part);
+	enc = tny_mime_part_get_transfer_encoding (part);
 	tny_stream_reset (attachment_stream);
-	tny_mime_part_construct_from_stream (result,
-					     attachment_stream,
-					     attachment_content_type);
+	tny_mime_part_construct (result,
+			         attachment_stream,
+				 attachment_content_type, 
+				 enc);
 	tny_stream_reset (attachment_stream);
 	
 	/* set other mime part fields */