X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=a3a6552b115f489b09c0dc75e96a219e6a93cd8e;hb=62fb96863939aea81ed8e45e1b2043d892e0978d;hp=bee62c0176529248e35b0e9dd36c8f9f3625a379;hpb=f90542249a6125dea14405f6ebfeeb8637f60f9c;p=modest

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index bee62c0..a3a6552 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -490,7 +490,8 @@ modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data)
 			header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (win)));
 			folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
 			if (folder) {
-				dimmed = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0);
+				dimmed = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0) ||
+					modest_header_view_is_empty (MODEST_HEADER_VIEW (header_view));
 
 				if (!dimmed &&
 				    (tny_folder_get_folder_type (TNY_FOLDER (folder)) == TNY_FOLDER_TYPE_OUTBOX)) {
@@ -619,11 +620,6 @@ modest_ui_dimming_rules_on_rename_folder (ModestWindow *win, gpointer user_data)
 		if (dimmed)
 			modest_dimming_rule_set_notification (rule, "");
 	}
-	if (!dimmed) {
-		dimmed = _transfer_mode_enabled (win);
-		if (dimmed)
-			modest_dimming_rule_set_notification (rule, "");
-	}
 
 	return dimmed;
 }
@@ -933,19 +929,24 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data)
 		if (MODEST_IS_MSG_VIEW_WINDOW (win))
 			dimmed = _msg_download_in_progress (win);
 		if (dimmed)
-			modest_dimming_rule_set_notification (rule, "");		
-		if (!dimmed && MODEST_IS_MSG_VIEW_WINDOW (win)) {
-			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, "");
-		}
+			modest_dimming_rule_set_notification (rule, "");
 	}
 
 	return dimmed;
 }
 
+gboolean
+modest_ui_dimming_rules_on_fetch_images (ModestWindow *win, gpointer user_data)
+{
+	gboolean dimmed = FALSE;
+
+	g_return_val_if_fail (MODEST_IS_MSG_VIEW_WINDOW (win), FALSE);
+
+	dimmed = !modest_msg_view_window_has_blocked_external_images (MODEST_MSG_VIEW_WINDOW (win));
+
+	return dimmed;
+}
+
 
 gboolean 
 modest_ui_dimming_rules_on_mark_as_read_msg_in_view (ModestWindow *win, gpointer user_data)
@@ -2562,7 +2563,7 @@ _invalid_clipboard_selected (ModestWindow *win,
 		result = !has_selection;
 	} else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
 		if (focused) {
-			MODEST_DEBUG_BLOCK (g_message ("FOCUSED %s", g_type_name (G_TYPE_FROM_INSTANCE (focused))););
+			MODEST_DEBUG_BLOCK (g_debug ("FOCUSED %s", g_type_name (G_TYPE_FROM_INSTANCE (focused))););
 			if (GTK_IS_LABEL (focused) && 
 			    !gtk_label_get_selection_bounds (GTK_LABEL (focused), NULL, NULL)) {
 				result = TRUE;
@@ -3108,7 +3109,8 @@ modest_ui_dimming_rules_on_header_window_move_to (ModestWindow *win, gpointer us
 		header_view = GTK_WIDGET (modest_header_window_get_header_view (MODEST_HEADER_WINDOW (win)));
 		folder = modest_header_view_get_folder (MODEST_HEADER_VIEW (header_view));
 		if (folder) {
-			dimmed = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0);
+			dimmed = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0) ||
+				modest_header_view_is_empty (MODEST_HEADER_VIEW (header_view));
 
 			if (!dimmed &&
 			    (tny_folder_get_folder_type (TNY_FOLDER (folder)) == TNY_FOLDER_TYPE_OUTBOX)) {