TnyList *parts;
TnyIterator *iter;
gchar *msg_content_type = NULL;
+ TnyMimePart *part_to_check;
if (msg == priv->msg) return;
return;
}
+ msg_content_type = modest_tny_mime_part_get_content_type (TNY_MIME_PART (priv->msg));
+ /* If the top mime part is a multipart/signed, we have to work with its first child (if available)
+ * as "message" for showing attachments */
+
+ part_to_check = NULL;
+ if ((msg_content_type != NULL) && !strcasecmp (msg_content_type, "multipart/signed")) {
+ TnyList *msg_children;
+ guint length;
+
+ msg_children = TNY_LIST (tny_simple_list_new ());
+ tny_mime_part_get_parts (TNY_MIME_PART (priv->msg), msg_children);
+
+ length = tny_list_get_length (msg_children);
+ if (length == 1 || length == 2) {
+ TnyIterator *iterator;
+
+ iterator = tny_list_create_iterator (msg_children);
+
+ part_to_check = TNY_MIME_PART (tny_iterator_get_current (iterator));
+
+ g_object_unref (iterator);
+ }
+
+ g_object_unref (msg_children);
+
+ }
+
+ if (part_to_check == NULL) {
+ part_to_check = g_object_ref (priv->msg);
+ } else {
+ 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/")) {
if (application_multipart) {
gtk_widget_queue_draw (GTK_WIDGET (attachments_view));
+ g_object_unref (part_to_check);
return;
}
} else {
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)) {
}
g_object_unref (iter);
g_object_unref (parts);
+ g_object_unref (part_to_check);
gtk_widget_queue_draw (GTK_WIDGET (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));
}
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),
(gint) event->x_root, (gint) event->y_root);
if (att_view != NULL) {
- if ((priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) ||
+ if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS) {
+ unselect_all (MODEST_ATTACHMENTS_VIEW (widget));
+ } else if ((priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) ||
(GTK_WIDGET_STATE (att_view) == GTK_STATE_SELECTED && (g_list_length (priv->selected) < 2))) {
TnyMimePart *mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view));
if (TNY_IS_MIME_PART (mime_part)) {
{
ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view);
+ if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS) {
+ unselect_all (atts_view);
+ return FALSE;
+ }
+
/* If grabbed (for example rubber banding), escape leaves the rubberbanding mode */
if (gtk_grab_get_current () == widget) {
if (event->keyval == GDK_Escape) {
if (!gtk_window_has_toplevel_focus (GTK_WINDOW (toplevel)))
return FALSE;
- children = gtk_container_get_children (GTK_CONTAINER (priv->box));
- if (children != NULL) {
- set_selected (atts_view, MODEST_ATTACHMENT_VIEW (children->data));
+ if (priv->style != MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS) {
+ children = gtk_container_get_children (GTK_CONTAINER (priv->box));
+ if (children != NULL) {
+ set_selected (atts_view, MODEST_ATTACHMENT_VIEW (children->data));
+ }
+ g_list_free (children);
}
- g_list_free (children);
return FALSE;
}
if (priv->style != style) {
priv->style = style;
gtk_widget_queue_draw (GTK_WIDGET (self));
- if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) {
- GTK_WIDGET_UNSET_FLAGS (self, GTK_CAN_FOCUS);
- } else {
+ if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_SELECTABLE) {
GTK_WIDGET_SET_FLAGS (self, GTK_CAN_FOCUS);
+ } else {
+ GTK_WIDGET_UNSET_FLAGS (self, GTK_CAN_FOCUS);
}
}