X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=5229f5c88663d8128d3eb45f7fd1de6d8a8efe96;hp=b637877071696d9aca4357a6b38148030da38426;hb=dbd1090d9f586c6e9d4d2bbf6f373d643e281a17;hpb=61fe7659cae8ab1d32e59c6e2f84e3cf79870d6f

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index b637877..5229f5c 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -33,6 +33,7 @@
 
 #include <string.h>
 #include "modest-ui-dimming-rules.h"
+#include "modest-ui-actions.h"
 #include "modest-dimming-rule.h"
 #include "modest-debug.h"
 #include "modest-tny-folder.h"
@@ -319,7 +320,6 @@ modest_ui_dimming_rules_define_dimming_state (ModestWindow *window)
 	return state;
 }
 
-
 gboolean 
 modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data)
 {
@@ -600,8 +600,11 @@ modest_ui_dimming_rules_on_open_msg (ModestWindow *win, gpointer user_data)
 	}
 	if (!dimmed) {
 		dimmed = state->any_marked_as_deleted;
-		if (dimmed)
-			modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_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);
@@ -737,7 +740,9 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
 		if (!dimmed) {
 			dimmed = state->any_marked_as_deleted;
 			if (dimmed) {
-				modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted"));
+				gchar *msg = modest_ui_actions_get_msg_already_deleted_error_msg (win);
+				modest_dimming_rule_set_notification (rule, msg);
+				g_free (msg);
 			}
 		}
 		if (!dimmed) {
@@ -754,8 +759,11 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
 		}
 		if (!dimmed) {
 			dimmed = state->any_marked_as_deleted;
-			if (dimmed)
-				modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_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;
@@ -950,7 +958,7 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user
 
 	
 	/* Check diming rules for folders transfer  */
-	if (gtk_widget_is_focus (folder_view)) {
+	if (folder_view && gtk_widget_is_focus (folder_view)) {
 		TnyFolderType types[5];
 		
 		types[0] = TNY_FOLDER_TYPE_DRAFTS; 
@@ -963,12 +971,12 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user
 		if (!dimmed) {
 			dimmed = _selected_folder_not_moveable (MODEST_MAIN_WINDOW(win));
 			if (dimmed)
-				modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_items"));
+				modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
 		}
 		if (!dimmed) {
 			dimmed = _selected_folder_is_any_of_type (win, types, 5);
 			if (dimmed)
-				modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr"));
+				modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
 		}
 	}
 	
@@ -976,14 +984,14 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user
 	if (!dimmed) {
 		dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE;
 		if (dimmed) {
-			gchar *message = g_strdup_printf(_("emev_bd_unabletomove_items"), 
+			gchar *message = g_strdup_printf(_("emev_nc_unabletomove_items"),
 							 state->already_opened_msg);
 			modest_dimming_rule_set_notification (rule, message);
 			g_free(message);
 		}
 	}
 	if (!dimmed) {
-		if (!gtk_widget_is_focus (folder_view))
+		if (!(folder_view && gtk_widget_is_focus (folder_view)))
 			dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data);
 		
 	}
@@ -1348,17 +1356,17 @@ modest_ui_dimming_rules_on_cut (ModestWindow *win, gpointer user_data)
 			if (!dimmed) {
 				dimmed = _selected_folder_not_deletable (MODEST_MAIN_WINDOW(win));
 				if (dimmed)
-					modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_items"));
+					modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
 			}
 			if (!dimmed) {
 				dimmed = _selected_folder_is_root_or_inbox (MODEST_MAIN_WINDOW(win));
 				if (dimmed)
-					modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr"));
+					modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
 			}
 			if (!dimmed) {
 				dimmed = _selected_folder_is_any_of_type (win, types, 3);
 				if (dimmed)
-					modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr"));
+					modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
 			}
 		}
 	}
@@ -1549,7 +1557,7 @@ modest_ui_dimming_rules_on_editor_remove_attachment (ModestWindow *win, gpointer
 		n_att_selected = tny_list_get_length (selected_attachments);
 		g_object_unref (selected_attachments);
 
-		dimmed = (n_att_selected != 1);
+		dimmed = (n_att_selected < 1);
 	}
 	
 	return dimmed;