X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=9fa15a1c9bfde38f7c7ccf1fd6da11fb9bc5f49f;hp=489697a713c441d7784d460a1803cb227fba5fff;hb=453f87bea325c0bf319bec40335c4faa24a5ae14;hpb=91526797480db76525e1295ec4a65f29f4bdc9cf

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 489697a..9fa15a1 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 */
@@ -847,3 +852,30 @@ get_content_type(const gchar *s)
 	}
 	return g_string_free(type, FALSE);
 }
+
+guint64
+modest_tny_msg_estimate_size (const gchar *plain_body, const gchar *html_body,
+			      guint64 parts_count,
+			      guint64 parts_size)
+{
+	guint64 result;
+
+	/* estimation of headers size */
+	result = 1024;
+
+	/* We add a 20% of size due to the increase in 7bit encoding */
+	if (plain_body) {
+		result += strlen (plain_body) * 120 / 100;
+	}
+	if (html_body) {
+		result += strlen (html_body) * 120 / 100;
+	}
+
+	/* 256 bytes per additional part because of their headers */
+	result += parts_count * 256;
+
+	/* 150% of increase per encoding */
+	result += parts_size * 3 / 2;
+
+	return result;
+}