Fixes leak 25/26

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

diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c
index 0201ec4..5617a65 100644 (file)
--- a/src/widgets/modest-attachments-view.c
+++ b/src/widgets/modest-attachments-view.c
@@ -205,7 +205,7 @@ modest_attachments_view_add_attachment (ModestAttachmentsView *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));
 }
@@ -243,20 +243,21 @@ modest_attachments_view_remove_attachment (ModestAttachmentsView *atts_view, Tny
 
                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);
-                       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);
+
        }
 
        gtk_widget_queue_resize (GTK_WIDGET (atts_view));
@@ -418,7 +419,9 @@ button_press_event (GtkWidget *widget,
                                                   (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)) {
@@ -535,6 +538,11 @@ key_press_event (GtkWidget *widget,
 {
        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) {
@@ -959,11 +967,13 @@ focus (GtkWidget *widget, GtkDirectionType direction, ModestAttachmentsView *att
        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;
 }
@@ -980,10 +990,10 @@ modest_attachments_view_set_style (ModestAttachmentsView *self,
        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);
                }
 
        }