X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=2bf54544f7183947b7383ea3bdc75208e9f765d6;hp=078ce0646b499374b8f2436e42b863f850f77189;hb=9e57e2cf29636dad01d035358e2795340e7a89d0;hpb=4ea353d0b611ac764e3285bb2b76c7110f9276ed

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 078ce06..2bf5454 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -1021,6 +1021,14 @@ modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user
 		if (dimmed)
 			modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading"));
 	}
+	if (!dimmed) {
+		dimmed = modest_window_get_dimming_state (win)->any_marked_as_deleted;
+		if (dimmed) {
+			gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win);
+			modest_dimming_rule_set_notification (rule, msg);
+			g_free (msg);
+		}
+	}
 	
 	if (!dimmed) {
 		dimmed = _selected_msg_sent_in_progress (win);
@@ -2620,7 +2628,8 @@ _invalid_folder_for_purge (ModestWindow *win,
 									      MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
 		if (!folder_view)
 			return FALSE;
-		folder = TNY_FOLDER (modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view)));
+		folder = (TnyFolder *) modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view));
+		/* Could be a folder store */
 		if (folder == NULL || ! TNY_IS_FOLDER (folder))
 			goto frees;		
 	} else {