static gboolean motion_notify_event (GtkWidget *widget, GdkEventMotion *event, ModestAttachmentsView *atts_view);
static gboolean button_release_event (GtkWidget *widget, GdkEventButton *event, ModestAttachmentsView *atts_view);
static gboolean key_press_event (GtkWidget *widget, GdkEventKey *event, ModestAttachmentsView *atts_view);
+static gboolean focus_out_event (GtkWidget *widget, GdkEventFocus *event, ModestAttachmentsView *atts_view);
+static gboolean focus (GtkWidget *widget, GtkDirectionType direction, ModestAttachmentsView *atts_view);
static GtkWidget *get_att_view_at_coords (ModestAttachmentsView *atts_view,
gdouble x, gdouble y);
static void unselect_all (ModestAttachmentsView *atts_view);
ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (attachments_view);
TnyList *parts;
TnyIterator *iter;
+ const gchar *msg_content_type = NULL;
if (msg == priv->msg) return;
- if (priv->msg)
+ if (priv->msg)
g_object_unref (priv->msg);
if (msg)
g_object_ref (G_OBJECT(msg));
return;
}
+ /* 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 = tny_mime_part_get_content_type (TNY_MIME_PART (priv->msg));
+ if ((msg_content_type != NULL) && !strcasecmp (msg_content_type, "multipart/related")) {
+ gtk_widget_queue_draw (GTK_WIDGET (attachments_view));
+ return;
+ }
+
+
parts = TNY_LIST (tny_simple_list_new ());
tny_mime_part_get_parts (TNY_MIME_PART (priv->msg), parts);
iter = tny_list_create_iterator (parts);
TnyMimePart *part;
part = TNY_MIME_PART (tny_iterator_get_current (iter));
- if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)) {
+ if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) {
modest_attachments_view_add_attachment (attachments_view, part);
}
- g_object_unref (part);
+
+ if (part)
+ g_object_unref (part);
+
tny_iterator_next (iter);
}
}
if (found_att_view) {
- priv->selected = g_list_remove (priv->selected, found_att_view);
- gtk_widget_destroy (GTK_WIDGET (found_att_view));
+ GList *node = NULL;
+ GtkWidget *next_widget = NULL;
+ GList *box_children = NULL;
+
+ box_children = gtk_container_get_children (GTK_CONTAINER (priv->box));
+ node = g_list_find (box_children, found_att_view);
+ if (node->next)
+ next_widget = node->next->data;
+
+ g_list_free (box_children);
+
+ node = g_list_find (priv->selected, found_att_view);
+ if (node != NULL) {
+ priv->selected = g_list_delete_link (priv->selected, node);
+ gtk_widget_destroy (GTK_WIDGET (found_att_view));
+ if ((priv->selected == NULL) && (next_widget != NULL))
+ set_selected (MODEST_ATTACHMENTS_VIEW (atts_view),
+ MODEST_ATTACHMENT_VIEW (next_widget));
+ }
own_clipboard (atts_view);
}
g_signal_connect (G_OBJECT (instance), "button-release-event", G_CALLBACK (button_release_event), instance);
g_signal_connect (G_OBJECT (instance), "motion-notify-event", G_CALLBACK (motion_notify_event), instance);
g_signal_connect (G_OBJECT (instance), "key-press-event", G_CALLBACK (key_press_event), instance);
+ g_signal_connect (G_OBJECT (instance), "focus-out-event", G_CALLBACK (focus_out_event), instance);
+ g_signal_connect (G_OBJECT (instance), "focus", G_CALLBACK (focus), instance);
GTK_WIDGET_SET_FLAGS (instance, GTK_CAN_FOCUS);
ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view);
if ((priv->selected != NULL)&&(priv->selected->next == NULL)) {
- TnyMimePart *mime_part = tny_mime_part_view_get_part (TNY_MIME_PART_VIEW (priv->selected->data));
- if (info != MODEST_ATTACHMENTS_VIEW_CLIPBOARD_TYPE_INDEX) {
- if (TNY_IS_MSG (mime_part)) {
- TnyHeader *header = tny_msg_get_header (TNY_MSG (mime_part));
- if (TNY_IS_HEADER (header)) {
- const gchar *subject = NULL;
- subject = tny_header_get_subject (header);
- if ((subject == NULL) || (subject[0] == '\0'))
- subject = _("mail_va_no_subject");
- gtk_selection_data_set_text (selection_data, subject, -1);
- g_object_unref (header);
- }
- } else {
- gtk_selection_data_set_text (selection_data, tny_mime_part_get_filename (mime_part), -1);
- }
- } else {
+ if (info == MODEST_ATTACHMENTS_VIEW_CLIPBOARD_TYPE_INDEX) {
/* MODEST_ATTACHMENT requested. As the content id is not filled in all the case, we'll
* use an internal index. This index is simply the index of the attachment in the vbox */
GList *box_children = NULL;
own_clipboard (ModestAttachmentsView *atts_view)
{
GtkTargetEntry targets[] = {
- {"TEXT", 0, 0},
- {"UTF8_STRING", 0, 1},
- {"COMPOUND_TEXT", 0, 2},
- {"STRING", 0, 3},
{MODEST_ATTACHMENTS_VIEW_CLIPBOARD_TYPE, 0, MODEST_ATTACHMENTS_VIEW_CLIPBOARD_TYPE_INDEX},
};
clipboard_get, clipboard_clear, G_OBJECT(atts_view));
}
+
+static gboolean
+focus_out_event (GtkWidget *widget, GdkEventFocus *event, ModestAttachmentsView *atts_view)
+{
+ if (!gtk_widget_is_focus (widget))
+ unselect_all (atts_view);
+
+ return FALSE;
+}
+
+static gboolean
+focus (GtkWidget *widget, GtkDirectionType direction, ModestAttachmentsView *atts_view)
+{
+ ModestAttachmentsViewPrivate *priv = MODEST_ATTACHMENTS_VIEW_GET_PRIVATE (atts_view);
+ GList *children = NULL;
+ GtkWidget *toplevel = NULL;
+
+ toplevel = gtk_widget_get_toplevel (widget);
+ 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));
+ }
+ g_list_free (children);
+
+ return FALSE;
+}
projects / modest / blobdiff