X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-attachment-view.c;h=f77cbc58d87099aad651741e262f3823978f0394;hb=a896d7726e8f7cce133a53a3b5a477a4902505c3;hp=3d724ac8e44a8437377082aac74ce09f71fc1b77;hpb=1cb8d01ea12aa1a9d17a25f7b57cd57f88d22f31;p=modest diff --git a/src/widgets/modest-attachment-view.c b/src/widgets/modest-attachment-view.c index 3d724ac..f77cbc5 100644 --- a/src/widgets/modest-attachment-view.c +++ b/src/widgets/modest-attachment-view.c @@ -37,11 +37,13 @@ #include #include #include +#include #include #include #include #include #include +#include #define GET_SIZE_BUFFER_SIZE 128 @@ -66,7 +68,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)) @@ -249,15 +255,30 @@ modest_attachment_view_set_part_default (TnyMimePartView *self, TnyMimePart *mim if (TNY_IS_HEADER (header)) { filename = g_strdup (tny_mime_part_get_filename (mime_part)); if (!filename) - filename = g_strdup (tny_header_get_subject (header)); - if (filename == NULL || filename[0] == '\0') + filename = tny_header_dup_subject (header); + if (filename == NULL || filename[0] == '\0') { + if (filename) + g_free (filename); 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 { @@ -266,7 +287,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; } } @@ -293,6 +314,37 @@ 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) { + gchar *disposition; + + disposition = modest_tny_mime_part_get_header_value (mime_part, "Content-Disposition"); + if (disposition) { + const gchar *size_tmp; + size_tmp = strstr (disposition, "size="); + if (size_tmp) size_tmp += strlen("size="); + if (size_tmp) { + gchar *disposition_value; + const gchar *size_end; + size_end = strstr (size_tmp, ";"); + if (size_end == NULL) { + disposition_value = g_strdup (size_tmp); + } else { + disposition_value = g_strndup (size_tmp, size_end - size_tmp); + } + if (disposition_value && disposition_value[0] != '\0') { + priv->size = atoll (disposition_value); + if (priv->size != 0) { + show_size = FALSE; + update_size_label (MODEST_ATTACHMENT_VIEW (self)); + } + } + g_free (disposition_value); + } + + g_free (disposition); + } + } + + if (show_size && priv->detect_size) { g_object_ref (self); if (!priv->get_size_stream) priv->get_size_stream = modest_count_stream_new (); @@ -362,8 +414,17 @@ modest_attachment_view_instance_init (GTypeInstance *instance, gpointer g_class) ModestAttachmentViewPrivate *priv = MODEST_ATTACHMENT_VIEW_GET_PRIVATE (instance); PangoContext *context; GtkWidget *box = NULL; + GtkWidget *icon_alignment = 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; + icon_alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0); + gtk_alignment_set_padding (GTK_ALIGNMENT (icon_alignment), 0, 0, 0, MODEST_MARGIN_DEFAULT); priv->icon = gtk_image_new (); priv->filename_view = gtk_label_new (""); gtk_label_set_line_wrap (GTK_LABEL (priv->filename_view), FALSE); @@ -376,12 +437,18 @@ 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; box = gtk_hbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX (box), priv->icon, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER (icon_alignment), priv->icon); + gtk_box_pack_start (GTK_BOX (box), icon_alignment, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (box), priv->filename_view, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (box), priv->size_view, FALSE, FALSE, 0); gtk_container_add (GTK_CONTAINER (instance), box); @@ -398,6 +465,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;