Adapted to latest Tinymail API changes

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

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index ef0cb28..0152b4b 100644 (file)
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -40,6 +40,8 @@
 #include <camel/camel-stream-mem.h>
 #include <glib/gprintf.h>
 #include <modest-tny-folder.h>
+#include "modest-tny-mime-part.h"
+
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -177,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));
@@ -207,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));
@@ -230,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;
@@ -247,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 */
@@ -408,9 +415,8 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
                return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
        } else {
                do {
-                       gchar *content_type = NULL;
-                       gchar *content_disp;
-                       gboolean has_content_disp;
+                       gchar *tmp, *content_type = NULL;
+                       gboolean has_content_disp_name = FALSE;
 
                        part = TNY_MIME_PART(tny_iterator_get_current (iter));
 
@@ -432,13 +438,18 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
                        content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
                        
                        /* mime-parts with a content-disposition header (either 'inline' or 'attachment')
-                        * cannot be body parts
+                        * and a 'name=' thingy cannot be body parts
                          */
-                       content_disp = modest_tny_mime_part_get_header_value (part, "Content-Disposition"); 
-                       has_content_disp = content_disp && strlen (content_disp) != 0;
-                       g_free (content_disp);
+                               
+                       tmp = modest_tny_mime_part_get_header_value (part, "Content-Disposition");
+                       if (tmp) {
+                               gchar *content_disp = g_ascii_strdown(tmp, -1);
+                               g_free (tmp);
+                               has_content_disp_name = g_strstr_len (content_disp, strlen(content_disp), "name=") != NULL;
+                               g_free (content_disp);
+                       }
                        
-                       if (g_str_has_prefix (content_type, desired_mime_type) && !has_content_disp) {
+                       if (g_str_has_prefix (content_type, desired_mime_type) && !has_content_disp_name) {
                                /* we found the desired mime-type! */
                                g_free (content_type);
                                break;
@@ -627,46 +638,16 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg,
        add_attachments (TNY_MIME_PART (new_msg), attachments_list, FALSE);
 
        /* Clean */
-       if (attachments_list)
+       if (attachments_list) {
+               g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
                g_list_free (attachments_list);
+       }
        g_object_unref (G_OBJECT (parts));
 
        return new_msg;
 }
 
 
-gchar*
-modest_tny_mime_part_get_header_value (TnyMimePart *part, const gchar *header)
-{
-       TnyList *pairs;
-       TnyIterator *iter;
-       gchar *val;
-       
-       g_return_val_if_fail (part && TNY_IS_MIME_PART(part), NULL);
-       g_return_val_if_fail (header, NULL);
-
-       pairs = tny_simple_list_new ();
-       
-       tny_mime_part_get_header_pairs (part, pairs);
-       iter = tny_list_create_iterator (pairs);
-
-       val = NULL;
-       while (!tny_iterator_is_done(iter) && !val) {
-
-               TnyPair *pair = (TnyPair*)tny_iterator_get_current(iter);
-               if (strcasecmp (header, tny_pair_get_name(pair)) == 0)
-                       val = g_strdup (tny_pair_get_value(pair));
-               g_object_unref (pair);          
-
-               tny_iterator_next (iter);
-       }
-
-       g_object_unref (pairs);
-       g_object_unref (iter);
-
-       return val;
-}
-
 
 static gint
 count_addresses (const gchar* addresses)