X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=fac56d578fca0c91125552e7ea8af0a169c17bf2;hp=31ae2028fc93816009e0d90587f731c730b984ad;hb=f7633249cd82c0808fa5a563b48b900e49988db7;hpb=cf600fb8c82e4f29a64a11b53361aa1f98a40f8c

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 31ae202..fac56d5 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -32,11 +32,10 @@
 #include <tny-gtk-text-buffer-stream.h>
 #include <tny-simple-list.h>
 #include <tny-folder.h>
-#include <modest-tny-platform-factory.h>
+#include <modest-runtime.h>
 #include <tny-camel-stream.h>
 #include <camel/camel-stream-mem.h>
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif /*HAVE_CONFIG_H */
@@ -61,12 +60,10 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 	gchar *content_type;
 	
 	/* Create new msg */
-	fact    = modest_tny_platform_factory_get_instance ();
+	fact    = modest_runtime_get_platform_factory ();
 	new_msg = tny_platform_factory_new_msg (fact);
-	header  = tny_platform_factory_new_header (fact);
+	header  = tny_msg_get_header (new_msg);
 	
-	/* WARNING: set the header before assign values to it */
-	tny_msg_set_header (new_msg, header);
 	tny_header_set_from (TNY_HEADER (header), from);
 	tny_header_set_replyto (TNY_HEADER (header), from);
 	tny_header_set_to (TNY_HEADER (header), mailto);
@@ -75,8 +72,7 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 	tny_header_set_subject (TNY_HEADER (header), subject);
 
 	content_type = get_content_type(body);
-	
-	
+		
 	/* Add the body of the new mail */	
 	add_body_part (new_msg, body, content_type, (attachments ? TRUE: FALSE));
 		       
@@ -96,9 +92,6 @@ add_body_part (TnyMsg *msg,
 {
 	TnyMimePart *text_body_part = NULL;
 	TnyStream *text_body_stream;
-	TnyPlatformFactory *fact;
-
-	fact = modest_tny_platform_factory_get_instance ();
 
 	/* Create the stream */
 	text_body_stream = TNY_STREAM (tny_camel_stream_new
@@ -107,7 +100,8 @@ add_body_part (TnyMsg *msg,
 
 	/* Create body part if needed */
 	if (has_attachments)
-		text_body_part = tny_platform_factory_new_mime_part (fact);
+		text_body_part = tny_platform_factory_new_mime_part
+			(modest_runtime_get_platform_factory ());
 	else
 		text_body_part = TNY_MIME_PART(msg);
 
@@ -138,15 +132,14 @@ add_attachments (TnyMsg *msg, GList *attachments_list)
 	const gchar *attachment_content_type;
 	const gchar *attachment_filename;
 	TnyStream *attachment_stream;
-	TnyPlatformFactory *fact;
 
-	fact = modest_tny_platform_factory_get_instance ();
 	for (pos = (GList *)attachments_list; pos; pos = pos->next) {
 
 		old_attachment = pos->data;
 		attachment_filename = tny_mime_part_get_filename (old_attachment);
 		attachment_stream = tny_mime_part_get_stream (old_attachment);
-		attachment_part = tny_platform_factory_new_mime_part (fact);
+		attachment_part = tny_platform_factory_new_mime_part (
+			modest_runtime_get_platform_factory());
 		
 		attachment_content_type = tny_mime_part_get_content_type (old_attachment);
 				 
@@ -272,6 +265,8 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html)
 static gboolean
 is_ascii(const gchar *s)
 {
+	if (!s)
+		return TRUE;
 	while (s[0]) {
 		if (s[0] & 128 || s[0] < 32)
 			return FALSE;