This is a manual merge of branch drop split view intro trunk.

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

diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c
index a94f1a0..2c0d678 100644 (file)
--- a/src/widgets/modest-attachment-view.c
+++ b/src/widgets/modest-attachment-view.c
@@ -37,8 +37,8 @@
 #include <modest-attachment-view.h>
 #include <modest-platform.h>
 #include <modest-text-utils.h>
+#include <modest-tny-mime-part.h>
 #include <tny-msg.h>
-#include <tny-camel-mem-stream.h>
 #include <modest-mail-operation.h>
 #include <modest-mail-operation-queue.h>
 #include <modest-runtime.h>
@@ -67,7 +67,11 @@ struct _ModestAttachmentViewPrivate
 
 };
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#define UNKNOWN_FILE_ICON "filemanager_unknown_file"
+#else
 #define UNKNOWN_FILE_ICON "qgn_list_gene_unknown_file"
+#endif
 
 #define MODEST_ATTACHMENT_VIEW_GET_PRIVATE(o)  \
        (G_TYPE_INSTANCE_GET_PRIVATE ((o), MODEST_TYPE_ATTACHMENT_VIEW, ModestAttachmentViewPrivate))
@@ -128,17 +132,15 @@ get_mime_part_size_thread (gpointer thr_user_data)
 {
        ModestAttachmentView *view =  (ModestAttachmentView *) thr_user_data;
        ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (view);
-       TnyStream *stream;
        gsize total = 0;
        gssize result = 0;
 
-       stream = modest_count_stream_new();
-       result = tny_mime_part_decode_to_stream (priv->mime_part, stream, NULL);
-       total = modest_count_stream_get_count(MODEST_COUNT_STREAM (stream));
+       result = tny_mime_part_decode_to_stream (priv->mime_part, priv->get_size_stream, NULL);
+       total = modest_count_stream_get_count(MODEST_COUNT_STREAM (priv->get_size_stream));
        if (total == 0) {
-               modest_count_stream_reset_count(MODEST_COUNT_STREAM (stream));
-               result = tny_mime_part_write_to_stream (priv->mime_part, stream, NULL);
-               total = modest_count_stream_get_count(MODEST_COUNT_STREAM (stream));
+               modest_count_stream_reset_count(MODEST_COUNT_STREAM (priv->get_size_stream));
+               result = tny_mime_part_write_to_stream (priv->mime_part, priv->get_size_stream, NULL);
+               total = modest_count_stream_get_count(MODEST_COUNT_STREAM (priv->get_size_stream));
        }
        
        /* if there was an error, don't set the size (this is pretty uncommon) */
@@ -148,8 +150,6 @@ get_mime_part_size_thread (gpointer thr_user_data)
                priv->size = (guint64)total;
                g_idle_add (idle_get_mime_part_size_cb, g_object_ref (view));
        }
-
-       g_object_unref (stream);
        g_object_unref (view);
 
        return NULL;
@@ -252,15 +252,29 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
        if (TNY_IS_MSG (mime_part)) {
                TnyHeader *header = tny_msg_get_header (TNY_MSG (mime_part));
                if (TNY_IS_HEADER (header)) {
-                       filename = g_strdup (tny_header_get_subject (header));
+                       filename = g_strdup (tny_mime_part_get_filename (mime_part));
+                       if (!filename)
+                               filename = tny_header_dup_subject (header);
                        if (filename == NULL || filename[0] == '\0')
                                filename = g_strdup (_("mail_va_no_subject"));
-                       if (priv->is_purged)
+                       if (priv->is_purged) {
                                file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, NULL);
-                       else
-                               file_icon_name = 
-                                       modest_platform_get_file_icon_name (
-                                               NULL, tny_mime_part_get_content_type (mime_part), NULL);
+                       } else {
+                               gchar *header_content_type;
+                               header_content_type = modest_tny_mime_part_get_content_type (mime_part);
+                               if ((g_str_has_prefix (header_content_type, "message/rfc822") ||
+                                    g_str_has_prefix (header_content_type, "multipart/") ||
+                                    g_str_has_prefix (header_content_type, "text/"))) {
+                                       file_icon_name = 
+                                               modest_platform_get_file_icon_name (
+                                                       NULL, tny_mime_part_get_content_type (mime_part), NULL);
+                               } else {
+                                       file_icon_name = 
+                                               modest_platform_get_file_icon_name (
+                                                       NULL, header_content_type, NULL);
+                               }
+                               g_free (header_content_type);
+                       }
                        g_object_unref (header);
                }
        } else {
@@ -269,7 +283,7 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
                        file_icon_name = modest_platform_get_file_icon_name (NULL, NULL, NULL);
                } else {
                        file_icon_name = modest_platform_get_file_icon_name (
-                               filename, tny_mime_part_get_content_type (mime_part), NULL);
+                               filename, modest_tny_mime_part_get_content_type (mime_part), NULL);
                        show_size = TRUE;
                }
        }
@@ -296,8 +310,9 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim
        gtk_label_set_text (GTK_LABEL (priv->size_view), "");
 
        if (show_size && priv->detect_size) {
-               tny_camel_mem_stream_get_type ();
                g_object_ref (self);
+               if (!priv->get_size_stream)
+                       priv->get_size_stream = modest_count_stream_new ();
                g_thread_create (get_mime_part_size_thread, self, FALSE, NULL);
        }
 
@@ -321,10 +336,8 @@ modest_attachment_view_clear_default (TnyMimePartView *self)
                priv->mime_part = NULL;
        }
 
-       if (priv->get_size_stream != NULL) {
-               g_object_unref (priv->get_size_stream);
-               priv->get_size_stream = NULL;
-       }
+       if (priv->get_size_stream)
+               modest_count_stream_reset_count(MODEST_COUNT_STREAM (priv->get_size_stream));
 
        priv->size = 0;
 
@@ -367,6 +380,12 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class)
        PangoContext *context;
        GtkWidget *box = NULL;
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       PangoAttrList *attr_list;
+       attr_list = pango_attr_list_new ();
+       pango_attr_list_insert (attr_list, pango_attr_underline_new (PANGO_UNDERLINE_SINGLE));
+#endif
+
        priv->mime_part = NULL;
        priv->icon = gtk_image_new ();
        priv->filename_view = gtk_label_new ("");
@@ -380,6 +399,11 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class)
        gtk_misc_set_alignment (GTK_MISC (priv->size_view), 0.0, 0.5);
        gtk_misc_set_alignment (GTK_MISC (priv->filename_view), 0.0, 0.5);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_label_set_attributes (GTK_LABEL (priv->filename_view), attr_list);
+       gtk_label_set_attributes (GTK_LABEL (priv->size_view), attr_list);
+#endif
+
        priv->get_size_stream = NULL;
        priv->size = 0;
        priv->detect_size = TRUE;
@@ -402,6 +426,10 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class)
        gtk_event_box_set_visible_window (GTK_EVENT_BOX (instance), TRUE);
        gtk_widget_set_events (GTK_WIDGET (instance), 0);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       pango_attr_list_unref (attr_list);
+#endif
+
        GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (instance), GTK_CAN_FOCUS);
 
        return;