From: Alberto Garcia <agarcia@igalia.com>
Date: Fri, 1 Feb 2008 11:50:28 +0000 (+0000)
Subject: Dim "Reply to" commands when a message is in the outbox
X-Git-Tag: git_migration_finished~1726
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=03cea934ab725b777fa4ce22917b069e2f219c3d;ds=sidebyside

Dim "Reply to" commands when a message is in the outbox
Fixes NB#79904

pmo-trunk-r4125
---

diff --git a/src/maemo/modest-msg-view-window.c b/src/maemo/modest-msg-view-window.c
index 7eb70ac..5316dd3 100644
--- a/src/maemo/modest-msg-view-window.c
+++ b/src/maemo/modest-msg-view-window.c
@@ -1854,7 +1854,7 @@ modest_msg_view_window_get_folder_type (ModestMsgViewWindow *window)
 
 		folder = tny_msg_get_folder (msg);
 		if (folder) {
-			folder_type = tny_folder_get_folder_type (folder);
+			folder_type = modest_tny_folder_guess_folder_type (folder);
 			g_object_unref (folder);
 		}
 		g_object_unref (msg);
diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 21b13fd..d72d3cc 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -625,19 +625,20 @@ modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_data)
 	g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
 	rule = MODEST_DIMMING_RULE (user_data);
 
+	types[0] = TNY_FOLDER_TYPE_DRAFTS;
+	types[1] = TNY_FOLDER_TYPE_OUTBOX;
+	types[2] = TNY_FOLDER_TYPE_ROOT;
+
+	/* Check dimmed rule */
+	if (!dimmed) {
+		dimmed = _selected_folder_is_any_of_type (win, types, 3);
+		if (dimmed)
+			modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply"));
+	}
+
 	/* main window dimming rules */
 	if (MODEST_IS_MAIN_WINDOW(win)) {
 		
-		types[0] = TNY_FOLDER_TYPE_DRAFTS; 
-		types[1] = TNY_FOLDER_TYPE_OUTBOX;
-		types[2] = TNY_FOLDER_TYPE_ROOT;
-		
-		/* Check dimmed rule */	
-		if (!dimmed) {
-			dimmed = _selected_folder_is_any_of_type (win, types, 3);			
-			if (dimmed)
-				modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply"));
-		}
 		if (!dimmed) {
 			dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win));			
 			if (dimmed)