X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=2da765570f1ec58e65cdd8816e38f5635e78df5b;hb=de2d9a7e88e25c2b3128cdc69a27c334cb9635ea;hp=d0c0124a9227d1c547c46b95cb7fc392df61e517;hpb=73babb855f21f4a4850afb9722f3e77bac313cf2;p=modest

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index d0c0124..2da7655 100644
--- 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;
@@ -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: