X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=a640b99298b80fa7bba4deffc9438647a7729b65;hp=dbf42f74daa8726d63e40d0e694099bb71e2cfd2;hb=7477373e6c399ba5ffaaeb84d4ecd687420d1549;hpb=fea09605e381472af9e9f7b8608883de1a72da99

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index dbf42f7..a640b99 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -863,11 +863,14 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
 		 * or when viewing a search result.
 		 */
 		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, _CS("ckct_ib_unable_to_delete"));
-				}
+			TnyMsg *top_msg = NULL;
+			top_msg = modest_msg_view_window_get_top_message ((ModestMsgViewWindow *) win);
+			if (top_msg != NULL) {
+				g_object_unref (top_msg);
+				dimmed = TRUE;
+			}
+			if (dimmed) {
+				modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
 			}
 		}
 	}
@@ -1807,6 +1810,27 @@ modest_ui_dimming_rules_on_set_style (ModestWindow *win, gpointer user_data)
 }
 
 gboolean 
+modest_ui_dimming_rules_on_editor_show_toolbar (ModestWindow *win, gpointer user_data)
+{
+	ModestDimmingRule *rule = NULL;
+	gboolean dimmed = FALSE;
+	
+	g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
+	g_return_val_if_fail (MODEST_IS_MSG_EDIT_WINDOW (win), TRUE);
+	rule = MODEST_DIMMING_RULE (user_data);
+
+	/* Check common dimming rules */
+	ModestMsgEditFormat format;
+	format = modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW (win));
+
+	dimmed = (format != MODEST_MSG_EDIT_FORMAT_HTML);
+	if (dimmed)
+		modest_dimming_rule_set_notification (rule, _("mcen_ib_item_unavailable_plaintext"));
+	
+	return dimmed;
+}
+
+gboolean 
 modest_ui_dimming_rules_on_zoom (ModestWindow *win, gpointer user_data)
 {
 	ModestDimmingRule *rule = NULL;
@@ -3117,10 +3141,7 @@ modest_ui_dimming_rules_on_insert_image (ModestWindow *win,
 {
 	g_return_val_if_fail (MODEST_MSG_EDIT_WINDOW (win), FALSE);
 
-	ModestMsgEditFormat format =
-	  modest_msg_edit_window_get_format (MODEST_MSG_EDIT_WINDOW (win));
-
-	return (format != MODEST_MSG_EDIT_FORMAT_HTML);
+	return modest_ui_dimming_rules_on_set_style (win, user_data);
 }
 
 static gboolean