* Review dimming rules of attachment menu option.

* Fixes: NB#61295

pmo-trunk-r2394

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index bc20375..043d711 100644 (file)
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -1998,7 +1998,6 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self,
 
        /* Apply folder rules */
        rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
-
        if (rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
                /* Set status failed and set an error */
                priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 102dc0f..98748fa 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -1227,7 +1227,11 @@ modest_ui_actions_on_header_selected (ModestHeaderView *header_view,
        /* If no header has been selected then exit */
        if (!header)
                return;
-       
+
+       /* Update focus */
+       if (!gtk_widget_is_focus (GTK_WIDGET(header_view)))
+           gtk_widget_grab_focus (GTK_WIDGET(header_view));
+
        /* Update Main window title */
        if (gtk_widget_is_focus (GTK_WIDGET(header_view))) {
                const gchar *subject = tny_header_get_subject (header);
@@ -2892,8 +2896,9 @@ modest_ui_actions_on_main_window_move_to (GtkAction *action,
                        g_object_unref (headers);
                }
        }
-       g_object_unref (folder_store);
  end:
+       if (folder_store != NULL)
+               g_object_unref (folder_store);
        gtk_widget_destroy (dialog);
 }
 

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index a816778..62b103b 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -43,7 +43,7 @@
 
 static gboolean _folder_is_any_of_type (TnyFolder *folder, TnyFolderType types[], guint ntypes);
 static gboolean _invalid_msg_selected (ModestMainWindow *win, gboolean unique, ModestDimmingRule *rule);
-static gboolean _invalid_attach_selected (ModestWindow *win, gboolean unique, ModestDimmingRule *rule);
+static gboolean _invalid_attach_selected (ModestWindow *win, gboolean unique, gboolean for_view, ModestDimmingRule *rule);
 static gboolean _invalid_clipboard_selected (ModestWindow *win);
 static gboolean _already_opened_msg (ModestWindow *win);
 static gboolean _selected_msg_marked_as (ModestWindow *win, TnyHeaderFlags mask, gboolean opposite);
@@ -543,7 +543,7 @@ modest_ui_dimming_rules_on_view_attachments (ModestWindow *win, gpointer user_da
 
        /* Check dimmed rule */ 
        if (!dimmed) 
-               dimmed = _invalid_attach_selected (win, TRUE, rule);                    
+               dimmed = _invalid_attach_selected (win, TRUE, TRUE, rule);                      
                
        return dimmed;
 }
@@ -560,7 +560,7 @@ modest_ui_dimming_rules_on_save_attachments (ModestWindow *win, gpointer user_da
 
        /* Check dimmed rule */ 
        if (!dimmed) 
-               dimmed = _invalid_attach_selected (win, FALSE, rule);                   
+               dimmed = _invalid_attach_selected (win, FALSE, FALSE, rule);                    
                
        return dimmed;
 }
@@ -577,9 +577,7 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_
 
        /* Check dimmed rule */ 
        if (!dimmed) {
-               dimmed = _invalid_attach_selected (win, FALSE, NULL);                   
-               if (dimmed) 
-                       modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_display_more"));
+               dimmed = _invalid_attach_selected (win, TRUE, TRUE, rule);                      
        }
 
        return dimmed;
@@ -1009,6 +1007,7 @@ _invalid_clipboard_selected (ModestWindow *win)
 static gboolean
 _invalid_attach_selected (ModestWindow *win,
                          gboolean unique,
+                         gboolean for_view,
                          ModestDimmingRule *rule) 
 {
        GList *attachments, *node;
@@ -1029,34 +1028,44 @@ _invalid_attach_selected (ModestWindow *win,
                /* Get selected atachments */
                attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win));
                n_selected = g_list_length (attachments);
-               for (node = attachments; node != NULL; node = g_list_next (node)) {
-                       TnyMimePart *mime_part = TNY_MIME_PART (node->data);
-                       TnyList *nested_list = tny_simple_list_new ();
-                       if (!tny_mime_part_is_attachment (mime_part)) {
-                               selected_messages = TRUE;
-                               break;
-                       }
-                       tny_mime_part_get_parts (mime_part, nested_list);
-                       if (tny_list_get_length (nested_list) > 0)
+
+               /* Check unique */              
+               if (!result) {
+                       if (unique) 
+                               result = n_selected != 1;
+                       else
+                               
+                               result = n_selected < 1;
+               }
+
+               /* Check attached type (view operation not required) */
+               if (!result && !for_view)  {
+                       for (node = attachments; node != NULL && !result; node = g_list_next (node)) {
+                               TnyMimePart *mime_part = TNY_MIME_PART (node->data);
+                               TnyList *nested_list = tny_simple_list_new ();
+                               if (TNY_IS_MSG (mime_part)) {
+                                       selected_messages = TRUE;
+                                       result = TRUE;
+                               }
+                               tny_mime_part_get_parts (mime_part, nested_list);
+                               if (tny_list_get_length (nested_list) > 0) {
                                nested_attachments = TRUE;
-                       g_object_unref (nested_list);
+                               result = TRUE;
+                               }
+                               g_object_unref (nested_list);
+                       }
                }
                
-               /* Check unique */
-               if (unique) 
-                       result = n_selected != 1;
-               else
-                       
-                       result = n_selected < 1;
-               
                /* Set notifications */
-               if (!result && rule != NULL) {
+               if (result && rule != NULL) {
                        if (selected_messages) {
                                modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_save_attach_mail"));
                        } else if (nested_attachments) {
                                modest_dimming_rule_set_notification (rule, _("FIXME:unable to save attachments with nested elements"));
                        } else if (n_selected == 0) {
                                modest_dimming_rule_set_notification (rule, _("FIXME:no attachment selected"));
+                       } else if (unique) {
+                               modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_display_more"));
                        }
                }