Don't allow to select attachments in editor view (fixes NB#102981).

pmo-trunk-r7689

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index a9609c7..e38fb29 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -794,6 +794,8 @@ init_window (ModestMsgEditWindow *obj)
        hildon_button_set_image (HILDON_BUTTON (priv->add_attachment_button), attachment_icon);
        gtk_box_pack_start (GTK_BOX (subject_box), priv->add_attachment_button, FALSE, FALSE, 0);
        priv->attachments_view = modest_attachments_view_new (NULL);
+       modest_attachments_view_set_style (MODEST_ATTACHMENTS_VIEW (priv->attachments_view),
+                                          MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS);
        
        priv->header_box = gtk_vbox_new (FALSE, 0);
        

diff --git a/src/widgets/modest-attachments-view.c b/src/widgets/modest-attachments-view.c
index 39babdf..a3e6c3f 100644 (file)
--- a/src/widgets/modest-attachments-view.c
+++ b/src/widgets/modest-attachments-view.c
@@ -419,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)) {
@@ -536,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) {
@@ -960,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;
 }
@@ -981,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);
                }
 
        }

diff --git a/src/widgets/modest-attachments-view.h b/src/widgets/modest-attachments-view.h
index 4bee16b..66b7ad1 100644 (file)
--- a/src/widgets/modest-attachments-view.h
+++ b/src/widgets/modest-attachments-view.h
@@ -49,6 +49,7 @@ G_BEGIN_DECLS
 typedef enum _ModestAttachmentsViewStyle {
        MODEST_ATTACHMENTS_VIEW_STYLE_SELECTABLE,
        MODEST_ATTACHMENTS_VIEW_STYLE_LINKS,
+       MODEST_ATTACHMENTS_VIEW_STYLE_NO_FOCUS,
 } ModestAttachmentsViewStyle;
 
 typedef struct _ModestAttachmentsView ModestAttachmentsView;