From: Sergio Villar Senin <svillar@igalia.com>
Date: Tue, 12 Feb 2008 10:25:09 +0000 (+0000)
Subject: 	* Fixes NB#80554, show the proper error message when deleting a sending message... 
X-Git-Tag: git_migration_finished~1689
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=30e29c1650b5b1c844070838d27040e079503064;ds=sidebyside

	* Fixes NB#80554, show the proper error message when deleting a sending message even though we have a viewer opened with that message

pmo-trunk-r4165
---

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index b2fa8ac..9666e2f 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -727,6 +727,19 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
 			dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data);
 		}
 		if (!dimmed) {
+			dimmed = state->sent_in_progress;
+			if (dimmed)
+				modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
+		}
+		if (!dimmed) {
+			dimmed = state->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 = (state->already_opened_msg > 0) ? TRUE : FALSE;
  			if (dimmed) {
 				gchar *num = NULL, *message = NULL;
@@ -739,19 +752,6 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
 			}
 			
 		}
-		if (!dimmed) {
-			dimmed = state->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 = state->sent_in_progress;
-			if (dimmed)
-				modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
-		}
 	} 
 	else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
 		if (!dimmed) {