* update for tinymail changes

[modest] / src / modest-tny-msg.c

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 7a71ad4..fac56d5 100644 (file)
--- 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 */
@@ -63,10 +62,8 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
        /* Create new msg */
        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));
                       
@@ -269,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;