* src/maemo/modest-main-window-ui.h:

[modest] / src / modest-ui-dimming-rules.c

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 9f9e4ad..2da7655 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -840,6 +840,13 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data)
                        if (dimmed)
                                modest_dimming_rule_set_notification (rule, "");
                }
+               if (!dimmed) {
+                       if (!modest_msg_view_window_is_search_result (MODEST_MSG_VIEW_WINDOW(win))) {
+                               dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW (win));
+                       }
+                       if (dimmed)
+                               modest_dimming_rule_set_notification (rule, "");
+               }
        }
 
        return dimmed;
@@ -1004,7 +1011,7 @@ modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user
        if (!dimmed) {
                dimmed = _selected_msg_sent_in_progress (win);
                if (dimmed)
-                       modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_move_mail_attachment"));
+                       modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_item"));
        }
        if (!dimmed) {
                if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
@@ -1018,7 +1025,7 @@ modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user
                }
                
                if (dimmed) 
-                       modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_move_mail_attachment"));
+                       modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_item"));
        }
 
        return dimmed;
@@ -1091,12 +1098,12 @@ modest_ui_dimming_rules_on_paste (ModestWindow *win, gpointer user_data)
        if (!dimmed) {
                dimmed = _selected_folder_is_same_as_source (win);
                if (dimmed)
-                       modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_copy_samefolder"));
+                       modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_copy_target_error"));
        }
        if (!dimmed) {
                dimmed = _selected_folder_has_subfolder_with_same_name (win);
                if (dimmed)
-                       modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_copy_samefolder"));
+                       modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_copy_target_error"));
        }
        
        return dimmed;
@@ -1211,6 +1218,14 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_
                        modest_dimming_rule_set_notification (rule, _("FIXME:no attachment selected"));
        }
 
+       if (!dimmed) {
+
+               dimmed = _selected_msg_sent_in_progress (win);
+               if (dimmed) {
+                       modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments"));
+               }
+       }
+
        /* cannot purge in editable drafts nor pop folders */
        if (!dimmed) {
                dimmed = _invalid_folder_for_purge (win, rule);
@@ -2155,8 +2170,7 @@ _selected_folder_is_same_as_source (ModestWindow *win)
        }
                
        /* Check source folder */
-       result = modest_email_clipboard_check_source_folder (clipboard, 
-                                                            (const TnyFolder *) folder);
+       result = modest_email_clipboard_check_source_folder (clipboard, TNY_FOLDER (folder));
        
        /* Free */
  frees: