GtkWidget *box;
GList *selected;
GtkWidget *rubber_start;
+ GtkWidget *press_att_view;
+ GtkWidget *previous_selection;
ModestAttachmentsViewStyle style;
};
return GTK_WIDGET (self);
}
+static void
+add_digest_attachments (ModestAttachmentsView *attachments_view, TnyMimePart *part)
+{
+ TnyList *parts;
+ TnyIterator *iter;
+
+ parts = TNY_LIST (tny_simple_list_new());
+ tny_mime_part_get_parts (TNY_MIME_PART (part), parts);
+
+ for (iter = tny_list_create_iterator(parts);
+ !tny_iterator_is_done (iter);
+ tny_iterator_next (iter)) {
+ TnyMimePart *cur_part = TNY_MIME_PART (tny_iterator_get_current (iter));
+ modest_attachments_view_add_attachment (attachments_view, cur_part, TRUE, 0);
+ g_object_unref (cur_part);
+ }
+ g_object_unref (iter);
+ g_object_unref (parts);
+
+}
+
void
modest_attachments_view_set_message (ModestAttachmentsView *attachments_view, TnyMsg *msg)
TnyIterator *iter;
gchar *msg_content_type = NULL;
TnyMimePart *part_to_check;
+ gboolean body_found;
+ gboolean is_alternate;
if (msg == priv->msg) 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));
+ is_alternate = !strcasecmp (msg_content_type, "multipart/alternative");
/* If the top mime part is a multipart/related, we don't show the attachments, as they're
* embedded images in body */
tny_mime_part_get_parts (TNY_MIME_PART (part_to_check), parts);
iter = tny_list_create_iterator (parts);
+ body_found = FALSE;
while (!tny_iterator_is_done (iter)) {
TnyMimePart *part;
+ gchar *content_type;
part = TNY_MIME_PART (tny_iterator_get_current (iter));
- if (part && (modest_tny_mime_part_is_attachment_for_modest (part)))
+ if (part && (modest_tny_mime_part_is_attachment_for_modest (part))) {
modest_attachments_view_add_attachment (attachments_view, part, TRUE, 0);
+ } else if (part && !is_alternate) {
+ content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
+ g_strstrip (content_type);
+
+ if (g_str_has_prefix (content_type, "multipart/digest")) {
+ add_digest_attachments (attachments_view, part);
+ } else if (body_found && g_str_has_prefix (content_type, "text/")) {
+ modest_attachments_view_add_attachment (attachments_view, part, TRUE, 0);
+ } else if (g_str_has_prefix (content_type, "multipart/") ||
+ g_str_has_prefix (content_type, "text/")) {
+ body_found = TRUE;
+ }
+ }
+
+
if (part)
g_object_unref (part);
priv->msg = NULL;
priv->box = gtk_vbox_new (FALSE, 0);
priv->rubber_start = NULL;
+ priv->press_att_view = NULL;
priv->selected = NULL;
priv->style = MODEST_ATTACHMENTS_VIEW_STYLE_SELECTABLE;
if (att_view != NULL) {
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)) {
- g_signal_emit (G_OBJECT (widget), signals[ACTIVATE_SIGNAL], 0, mime_part);
- g_object_unref (mime_part);
- }
+ } else if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) {
+ priv->press_att_view = att_view;
+ set_selected (MODEST_ATTACHMENTS_VIEW (widget), MODEST_ATTACHMENT_VIEW (att_view));
+ gtk_grab_add (widget);
} else {
+ if (g_list_length (priv->selected) == 1) {
+ priv->previous_selection = GTK_WIDGET (priv->selected->data);
+ } else {
+ priv->previous_selection = NULL;
+ }
TnyMimePart *mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view));
/* Do not select purged attachments */
att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget),
(gint) event->x_root, (gint) event->y_root);
- if (att_view != NULL) {
+ if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) {
unselect_all (MODEST_ATTACHMENTS_VIEW (widget));
- select_range (MODEST_ATTACHMENTS_VIEW (widget),
- MODEST_ATTACHMENT_VIEW (priv->rubber_start),
- MODEST_ATTACHMENT_VIEW (att_view));
+ if (att_view == priv->press_att_view) {
+ TnyMimePart *mime_part;
+ mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view));
+ g_signal_emit (G_OBJECT (widget), signals[ACTIVATE_SIGNAL], 0, mime_part);
+ g_object_unref (mime_part);
+ }
+ priv->press_att_view = NULL;
+ } else {
+
+ if (priv->style != MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS &&
+ priv->rubber_start == att_view &&
+ priv->previous_selection == att_view) {
+ TnyMimePart *mime_part;
+ mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (att_view));
+ g_signal_emit (G_OBJECT (widget), signals[ACTIVATE_SIGNAL], 0, mime_part);
+ g_object_unref (mime_part);
+ } else if (att_view != NULL) {
+ unselect_all (MODEST_ATTACHMENTS_VIEW (widget));
+ select_range (MODEST_ATTACHMENTS_VIEW (widget),
+ MODEST_ATTACHMENT_VIEW (priv->rubber_start),
+ MODEST_ATTACHMENT_VIEW (att_view));
+ }
+ priv->rubber_start = NULL;
}
- priv->rubber_start = NULL;
gtk_grab_remove (widget);
}
return TRUE;
att_view = get_att_view_at_coords (MODEST_ATTACHMENTS_VIEW (widget),
(gint) event->x_root, (gint) event->y_root);
+ if (priv->style == MODEST_ATTACHMENTS_VIEW_STYLE_LINKS) {
+ if (att_view == priv->press_att_view) {
+ if (priv->selected == NULL)
+ set_selected (MODEST_ATTACHMENTS_VIEW (widget), MODEST_ATTACHMENT_VIEW (att_view));
+ } else {
+ if (priv->selected) {
+ unselect_all (MODEST_ATTACHMENTS_VIEW (widget));
+ }
+ }
+ } else {
- if (att_view != NULL) {
- unselect_all (MODEST_ATTACHMENTS_VIEW (widget));
- select_range (MODEST_ATTACHMENTS_VIEW (widget),
- MODEST_ATTACHMENT_VIEW (priv->rubber_start),
- MODEST_ATTACHMENT_VIEW (att_view));
+ if (att_view != NULL) {
+ unselect_all (MODEST_ATTACHMENTS_VIEW (widget));
+ select_range (MODEST_ATTACHMENTS_VIEW (widget),
+ MODEST_ATTACHMENT_VIEW (priv->rubber_start),
+ MODEST_ATTACHMENT_VIEW (att_view));
+ }
}
+ gdk_event_request_motions (event);
}
return TRUE;
}