removing dependencies of libprofile-dev, profile-data-dev, libosso-abook-dev and...

[modest] / src / widgets / modest-attachments-view.c

diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c
index a3e6c3f..96f21c7 100644 (file)
--- a/src/widgets/modest-attachments-view.c
+++ b/src/widgets/modest-attachments-view.c
@@ -40,6 +40,7 @@
 #include <modest-attachment-view.h>
 #include <modest-attachments-view.h>
 #include <modest-tny-mime-part.h>
+#include <modest-tny-msg.h>
 
 static GObjectClass *parent_class = NULL;
 
@@ -109,6 +110,7 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn
        TnyList *parts;
        TnyIterator *iter;
        gchar *msg_content_type = NULL;
+       TnyMimePart *part_to_check;
        
        if (msg == priv->msg) return;
 
@@ -128,16 +130,19 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn
                return;
        }
 
+       part_to_check = modest_tny_msg_get_attachments_parent (TNY_MSG (msg));
+
+       msg_content_type = modest_tny_mime_part_get_content_type (TNY_MIME_PART (part_to_check));
+
        /* If the top mime part is a multipart/related, we don't show the attachments, as they're
         * embedded images in body */
-       msg_content_type = modest_tny_mime_part_get_content_type (TNY_MIME_PART (priv->msg));
        if ((msg_content_type != NULL) && !strcasecmp (msg_content_type, "multipart/related")) {
                gchar *header_content_type;
                gboolean application_multipart = FALSE;
 
                g_free (msg_content_type);
 
-               header_content_type = modest_tny_mime_part_get_headers_content_type (TNY_MIME_PART (priv->msg));
+               header_content_type = modest_tny_mime_part_get_headers_content_type (TNY_MIME_PART (part_to_check));
                
                if ((header_content_type != NULL) && 
                    !strstr (header_content_type, "application/")) {
@@ -147,6 +152,7 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn
 
                if (application_multipart) {
                        gtk_widget_queue_draw (GTK_WIDGET (attachments_view));
+                       g_object_unref (part_to_check);
                        return;
                }
        } else {
@@ -159,14 +165,15 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn
                g_free (msg_content_type);
 
                if (direct_attach) {
-                       modest_attachments_view_add_attachment (attachments_view, TNY_MIME_PART (msg), TRUE, 0);
+                       modest_attachments_view_add_attachment (attachments_view, TNY_MIME_PART (part_to_check), TRUE, 0);
                        gtk_widget_queue_draw (GTK_WIDGET (attachments_view));
+                       g_object_unref (part_to_check);
                        return;
                }
        }
 
        parts = TNY_LIST (tny_simple_list_new ());
-       tny_mime_part_get_parts (TNY_MIME_PART (priv->msg), parts);
+       tny_mime_part_get_parts (TNY_MIME_PART (part_to_check), parts);
        iter = tny_list_create_iterator (parts);
 
        while (!tny_iterator_is_done (iter)) {
@@ -184,6 +191,7 @@ modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, Tn
        }
        g_object_unref (iter);
        g_object_unref (parts);
+       g_object_unref (part_to_check);
        
 
        gtk_widget_queue_draw (GTK_WIDGET (attachments_view));
@@ -205,7 +213,7 @@ modest_attachments_view_add_attachment (ModestAttachmentsView *attachments_view,
        att_view = modest_attachment_view_new (part, detect_size);
        if (!detect_size)
                modest_attachment_view_set_size (MODEST_ATTACHMENT_VIEW (att_view), size);
-       gtk_box_pack_end (GTK_BOX (priv->box), att_view, FALSE, FALSE, 0);
+       gtk_box_pack_start (GTK_BOX (priv->box), att_view, FALSE, FALSE, 0);
        gtk_widget_show_all (att_view);
        gtk_widget_queue_resize (GTK_WIDGET (attachments_view));
 }
@@ -243,14 +251,14 @@ modest_attachments_view_remove_attachment (ModestAttachmentsView *atts_view, Tny
 
                box_children = gtk_container_get_children (GTK_CONTAINER (priv->box));
                node = g_list_find (box_children, found_att_view);
-               if (node->next)
+               if (node && node->next)
                        next_widget = node->next->data;
 
                g_list_free (box_children);
                gtk_widget_destroy (GTK_WIDGET (found_att_view));
 
                node = g_list_find (priv->selected, found_att_view);
-               if (node != NULL) {
+               if (node) {
                        priv->selected = g_list_delete_link (priv->selected, node);
                        if ((priv->selected == NULL) && (next_widget != NULL))
                                set_selected (MODEST_ATTACHMENTS_VIEW (atts_view),