X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=ef93ecbc575e1c58db0f9e4192ab4bd3fc13c82b;hp=7ab6ff0edcf0d6740a2effee1d6354a0f98d4e1e;hb=e45958deaf9701399c552ea0d84c2447efacd4ca;hpb=f4c8ac213f2217771e21aade64fbed16d618a77e

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 7ab6ff0..ef93ecb 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -38,6 +38,7 @@
 #include "modest-debug.h"
 #include "modest-tny-folder.h"
 #include "modest-tny-account.h"
+#include "modest-tny-mime-part.h"
 #include "modest-text-utils.h"
 #include <widgets/modest-attachments-view.h>
 #include <modest-runtime.h>
@@ -60,7 +61,6 @@ static gboolean _selected_folder_not_renameable (ModestMainWindow *win);
 static gboolean _selected_folder_not_deletable (ModestMainWindow *win);
 static gboolean _selected_folder_is_any_of_type (ModestWindow *win, TnyFolderType types[], guint ntypes);
 static gboolean _selected_folder_is_root_or_inbox (ModestMainWindow *win);
-static gboolean _selected_folder_is_MMC_or_POP_root (ModestMainWindow *win);
 static gboolean _selected_folder_is_root (ModestMainWindow *win);
 static gboolean _header_view_is_all_selected (ModestMainWindow *win);
 static gboolean _selected_folder_is_empty (ModestMainWindow *win);
@@ -69,7 +69,6 @@ static gboolean _selected_folder_is_same_as_source (ModestWindow *win);
 static gboolean _msg_download_in_progress (ModestWindow *win);
 static gboolean _msg_download_completed (ModestMainWindow *win);
 static gboolean _selected_msg_sent_in_progress (ModestWindow *win);
-static gboolean _sending_in_progress (ModestWindow *win);
 static gboolean _invalid_folder_for_purge (ModestWindow *win, ModestDimmingRule *rule);
 static gboolean _transfer_mode_enabled (ModestWindow *win);
 static gboolean _selected_folder_has_subfolder_with_same_name (ModestWindow *win);
@@ -98,6 +97,7 @@ _define_main_window_dimming_state (ModestMainWindow *window)
 	gboolean all_seen = TRUE;
 	gboolean all_cached = TRUE;
 	gboolean all_has_attach = TRUE;
+	TnyFolder *folder = NULL;
 
 	g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(window), NULL);
 
@@ -172,23 +172,28 @@ _define_main_window_dimming_state (ModestMainWindow *window)
 			state->any_has_attachments = flags & TNY_HEADER_FLAG_ATTACHMENTS;
 	
 		/* sent in progress */
-		msg_uid = modest_tny_send_queue_get_msg_id (header);
-		if (!state->sent_in_progress) {
-			cache_mgr = modest_runtime_get_cache_mgr ();
-			send_queue_cache = modest_cache_mgr_get_cache (cache_mgr,
-								       MODEST_CACHE_MGR_CACHE_TYPE_SEND_QUEUE);
-			
-			g_hash_table_foreach (send_queue_cache, (GHFunc) fill_list_of_caches, &send_queues);
+		folder = tny_header_get_folder (header);
+		if (folder) {
+			if (modest_tny_folder_guess_folder_type (folder) == TNY_FOLDER_TYPE_OUTBOX) {
+				msg_uid = modest_tny_send_queue_get_msg_id (header);
+				if (!state->sent_in_progress) {
+					cache_mgr = modest_runtime_get_cache_mgr ();
+					send_queue_cache = modest_cache_mgr_get_cache (cache_mgr,
+										       MODEST_CACHE_MGR_CACHE_TYPE_SEND_QUEUE);
 			
-			for (node = send_queues; node != NULL && !found; node = g_slist_next (node)) {
-				send_queue = MODEST_TNY_SEND_QUEUE (node->data);
-				
-				/* Check if msg uid is being processed inside send queue */
-				found = modest_tny_send_queue_msg_is_being_sent (send_queue, msg_uid);		
+					g_hash_table_foreach (send_queue_cache, (GHFunc) fill_list_of_caches, &send_queues);
+					
+					for (node = send_queues; node != NULL && !found; node = g_slist_next (node)) {
+						send_queue = MODEST_TNY_SEND_QUEUE (node->data);
+						
+						/* Check if msg uid is being processed inside send queue */
+						found = modest_tny_send_queue_msg_is_being_sent (send_queue, msg_uid);		
+					}
+					state->sent_in_progress = found;
+				}
 			}
-			state->sent_in_progress = found;
+			g_object_unref (folder);
 		}
-
 		tny_iterator_next (iter);
 		g_object_unref (header);
 	}
@@ -384,11 +389,14 @@ modest_ui_dimming_rules_on_new_folder (ModestWindow *win, gpointer user_data)
 		if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) {
 			dimmed = FALSE;
 		} else {
-			const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (parent_folder));
-			if (proto_str != NULL) {
-				/* If it's POP then dim */			
-				dimmed = (modest_protocol_info_get_transport_store_protocol (proto_str) == 
-					  MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE;
+			ModestProtocolType protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (parent_folder));
+			if (protocol_type != MODEST_PROTOCOL_REGISTRY_TYPE_INVALID) {
+				ModestProtocolRegistry *protocol_registry;
+
+				protocol_registry = modest_runtime_get_protocol_registry ();
+				/* If account does not support folders (pop) then dim */
+				dimmed = (!modest_protocol_registry_protocol_type_has_tag (protocol_registry, protocol_type,
+											   MODEST_PROTOCOL_REGISTRY_STORE_HAS_FOLDERS));
 				if (dimmed)
 					modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_create_error"));
 			}
@@ -503,11 +511,6 @@ modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data)
 			modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_delete_error"));
 	}
 	if (!dimmed) {
-		dimmed = _selected_folder_is_MMC_or_POP_root (MODEST_MAIN_WINDOW(win));
-		if (dimmed)
-			modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_delete_error"));
-	}
-	if (!dimmed) {
 		dimmed = _transfer_mode_enabled (win);
 		if (dimmed)
 			modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
@@ -527,15 +530,11 @@ modest_ui_dimming_rules_on_sort (ModestWindow *win, gpointer user_data)
 	rule = MODEST_DIMMING_RULE (user_data);
 		
 	/* Check dimmed rule */	
-	if (!dimmed) {
+	if (!dimmed)
 		dimmed = _selected_folder_is_root (MODEST_MAIN_WINDOW(win));
-		modest_dimming_rule_set_notification (rule, _CS("ckdg_ib_nothing_to_sort"));
-	}
 
-	if (!dimmed) {
+	if (!dimmed)
 		dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win));
-		modest_dimming_rule_set_notification (rule, _CS("ckdg_ib_nothing_to_sort"));
-	}
 
 	return dimmed;
 	
@@ -704,6 +703,33 @@ modest_ui_dimming_rules_always_dimmed (ModestWindow *win, gpointer user_data)
 	return dimmed;
 }
 
+static gboolean
+_message_already_sent (ModestMsgViewWindow *view_window)
+{
+	TnyHeader *header;
+	TnyFolder *folder;
+	gboolean already_sent = FALSE;
+
+	header = modest_msg_view_window_get_header (view_window);
+	if (header) {
+		folder = tny_header_get_folder (header);
+		if (folder) {
+			if (modest_tny_folder_guess_folder_type (folder) ==
+			    TNY_FOLDER_TYPE_OUTBOX) {				
+				ModestTnySendQueueStatus status = 
+					modest_tny_all_send_queues_get_msg_status (header);
+				if (status == MODEST_TNY_SEND_QUEUE_UNKNOWN ||
+				    status == MODEST_TNY_SEND_QUEUE_SENDING)
+					already_sent = TRUE;
+			}
+			g_object_unref (folder);
+		}
+		g_object_unref (header);
+	}
+	return already_sent;
+}
+
+
 gboolean 
 modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
 {
@@ -726,17 +752,9 @@ 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->already_opened_msg > 0) ? TRUE : FALSE;
- 			if (dimmed) {
-				gchar *num = NULL, *message = NULL;
-
-				num = g_strdup_printf ("%d", state->already_opened_msg);
-				message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), num);
-				modest_dimming_rule_set_notification (rule, message);
- 				g_free(num);
- 				g_free(message);
-			}
-			
+			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;
@@ -747,9 +765,16 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
 			}
 		}
 		if (!dimmed) {
-			dimmed = state->sent_in_progress;
-			if (dimmed)
-				modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
+			dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE;
+ 			if (dimmed) {
+				gchar *message = NULL;
+
+				message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), 
+							  state->already_opened_msg);
+				modest_dimming_rule_set_notification (rule, message);
+ 				g_free(message);
+			}
+			
 		}
 	} 
 	else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
@@ -771,6 +796,11 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
 			if (dimmed)
 				modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
 		}
+
+		/* This could happen if we're viewing a message of the
+		   outbox that has been already sent */
+		if (!dimmed)
+			dimmed = _message_already_sent (MODEST_MSG_VIEW_WINDOW(win));
 		
 		/* The delete button should be dimmed when viewing an attachment,
 		 * but should be enabled when viewing a message from the list, 
@@ -840,8 +870,9 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data)
 						modest_dimming_rule_set_notification (rule, "");
 				}
 
+			} else {
+				return TRUE;
 			}
-
 		}
 
 	/* msg view window dimming rules */
@@ -1021,12 +1052,26 @@ 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);
 		if (dimmed)
 			modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_item"));
 	}
+
+	/* This could happen if we're viewing a message of the outbox
+	   that has been already sent */
+	if (!dimmed)
+		dimmed = _message_already_sent (MODEST_MSG_VIEW_WINDOW(win));
+
 	if (!dimmed) {
 		if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
 			/* The move_to button should be dimmed when viewing an attachment,
@@ -1232,6 +1277,26 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_
 			modest_dimming_rule_set_notification (rule, _("FIXME:no attachment selected"));
 	}
 
+	/* Messages as attachments could not be removed */
+	if (!dimmed && MODEST_IS_MSG_VIEW_WINDOW (win)) {
+		TnyList *attachments;
+		TnyIterator *iter;
+		attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW (win));
+		if (attachments) {
+			iter = tny_list_create_iterator (attachments);
+			while (!tny_iterator_is_done (iter) && !dimmed) {
+				TnyMimePart *mime_part = (TnyMimePart *)
+					tny_iterator_get_current (iter);
+				if (modest_tny_mime_part_is_msg (mime_part))
+					dimmed = TRUE;
+				g_object_unref (mime_part);
+				tny_iterator_next (iter);
+			}
+			g_object_unref (iter);
+			g_object_unref (attachments);
+		}
+	}
+
 	if (!dimmed) {
 
 		dimmed = _selected_msg_sent_in_progress (win);
@@ -1243,6 +1308,8 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_
 	/* cannot purge in editable drafts nor pop folders */
 	if (!dimmed) {
 		dimmed = _invalid_folder_for_purge (win, rule);
+		if (dimmed)
+			modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments"));
 	}
 
 	/* Check if the selected message in main window has attachments */
@@ -1264,7 +1331,6 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_
 			modest_dimming_rule_set_notification (rule, _("mail_ib_attach_not_local"));
 	}
 
-
 	return dimmed;
 }
 
@@ -1589,10 +1655,9 @@ modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data)
 		body_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (body_field));
 		subject = gtk_entry_get_text (GTK_ENTRY (subject_field));
 
-		dimmed = ((subject == NULL || subject[0] == '\0')
-			  || (gtk_text_buffer_get_char_count(body_buffer) == 0));
+		dimmed = (subject == NULL || subject[0] == '\0');
 		if (dimmed)
-			modest_dimming_rule_set_notification (rule, _("mcen_ib_subject_or_body_not_modified"));
+			modest_dimming_rule_set_notification (rule, _("mcen_ib_subject_not_modified"));
 	}
 	       
 	if (!dimmed) {
@@ -1705,37 +1770,7 @@ modest_ui_dimming_rules_on_cancel_sending (ModestWindow *win, gpointer user_data
 			modest_dimming_rule_set_notification (rule, "");
  	}
 	if (!dimmed) {
-		dimmed = !_sending_in_progress (win);
- 		if (dimmed)
-			modest_dimming_rule_set_notification (rule, "");
-	}
-
-	return dimmed;
-}
-
-gboolean 
-modest_ui_dimming_rules_on_csm_cancel_sending (ModestWindow *win, gpointer user_data)
-{
- 	ModestDimmingRule *rule = NULL;
-	TnyFolderType types[1];
-	const DimmedState *state = NULL;
-	gboolean dimmed = FALSE;
-
-	g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE);
-	g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
-	rule = MODEST_DIMMING_RULE (user_data);
-	state = modest_window_get_dimming_state (win);
-
-	types[0] = TNY_FOLDER_TYPE_OUTBOX; 
-
-	/* Check dimmed rules */	
-	if (!dimmed) {
-		dimmed = !_selected_folder_is_any_of_type (win, types, 1);
- 		if (dimmed) 
-			modest_dimming_rule_set_notification (rule, "");
- 	}
-	if (!dimmed) {
-		dimmed = !_sending_in_progress (win);
+		dimmed = !state->sent_in_progress;
  		if (dimmed)
 			modest_dimming_rule_set_notification (rule, "");
 	}
@@ -1818,6 +1853,8 @@ modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_dat
 				int len = -1;
 				sel = gtk_html_get_selection_html (GTK_HTML (focused), &len);
 				do_check = !((sel == NULL) || (sel[0] == '\0'));
+			} else if (MODEST_IS_ATTACHMENTS_VIEW (focused)) {
+				do_check = FALSE;
 			}
 			if (do_check) {
 				clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
@@ -2011,7 +2048,7 @@ _selected_folder_is_root_or_inbox (ModestMainWindow *win)
 
 	/* Check pop and MMC accounts */
 	if (!result) {
-		result = _selected_folder_is_MMC_or_POP_root (win);
+		result = _selected_folder_is_root (win);
 	}
 		
 	return result;
@@ -2035,6 +2072,7 @@ _selected_folder_is_root (ModestMainWindow *win)
 			modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
 		if (folder_store) {
 			is_account = TNY_IS_ACCOUNT (folder_store);
+
 			g_object_unref (folder_store);
 			folder_store = NULL;
 		}
@@ -2049,49 +2087,6 @@ _selected_folder_is_root (ModestMainWindow *win)
 	/* Check folder type */
 	result = _selected_folder_is_any_of_type (MODEST_WINDOW(win), types, 1);
 		
-	/* Check pop and MMC accounts */
-	if (!result) {
-		result = _selected_folder_is_MMC_or_POP_root (win);
-	}
-
-	return result;
-}
-
-static gboolean
-_selected_folder_is_MMC_or_POP_root (ModestMainWindow *win)
-{
-	GtkWidget *folder_view = NULL;
-	TnyFolderStore *parent_folder = NULL;
-	gboolean result = FALSE;
-
-	folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
-							   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-	if (!folder_view)
-		return FALSE;
-
-	/* Get selected folder as parent of new folder to create */
-	parent_folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
-	if (!parent_folder)
-		return TRUE;
-	
-	if (TNY_IS_ACCOUNT (parent_folder)) {
-		/* If it's the local account then do not dim */
-		if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) {
-			result = FALSE;
-		} else {
-				/* If it's the MMC root folder then dim it */
-			if (!strcmp (tny_account_get_id (TNY_ACCOUNT (parent_folder)), MODEST_MMC_ACCOUNT_ID)) {
-					result = TRUE;
-			} else {
-				const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (parent_folder));
-				/* If it's POP then dim */
-				result = (modest_protocol_info_get_transport_store_protocol (proto_str) == 
-						  MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE;
-			}
-		}
-	}
-	g_object_unref (parent_folder);
-
 	return result;
 }
 
@@ -2110,7 +2105,7 @@ _header_view_is_all_selected (ModestMainWindow *win)
 static gboolean
 _selected_folder_is_empty (ModestMainWindow *win)
 {
-	GtkWidget *folder_view = NULL;
+	GtkWidget *folder_view = NULL, *header_view = NULL;
 	TnyFolderStore *folder = NULL;
 	gboolean result = FALSE;
 
@@ -2119,8 +2114,12 @@ _selected_folder_is_empty (ModestMainWindow *win)
 	/* Get folder view */
 	folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
 							   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+
+	header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
+							   MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+
 	/* If no folder view, always dimmed */
-	if (!folder_view)
+	if (!folder_view || !header_view)
 		return TRUE;
 	
 	/* Get selected folder as parent of new folder to create */
@@ -2132,7 +2131,9 @@ _selected_folder_is_empty (ModestMainWindow *win)
 	}
 	
 	/* Check folder type */
-	result = tny_folder_get_all_count (TNY_FOLDER (folder)) == 0;
+	if (modest_header_view_is_empty (MODEST_HEADER_VIEW (header_view)) ||
+	    tny_folder_get_all_count (TNY_FOLDER (folder)) == 0)
+		result = TRUE;
 
 	/* free */
 	g_object_unref (folder);
@@ -2401,7 +2402,7 @@ _invalid_attach_selected (ModestWindow *win,
 			while (!tny_iterator_is_done (iter) && !result) {
 				TnyMimePart *mime_part = TNY_MIME_PART (tny_iterator_get_current (iter));
 				TnyList *nested_list = tny_simple_list_new ();
-				if (!for_remove && TNY_IS_MSG (mime_part)) {
+				if (!for_remove && modest_tny_mime_part_is_msg (mime_part)) {
 					selected_messages = TRUE;
 					result = TRUE;
 				}
@@ -2568,34 +2569,6 @@ _selected_msg_sent_in_progress (ModestWindow *win)
 
 
 static gboolean
-_sending_in_progress (ModestWindow *win)
-{
-	GHashTable *send_queue_cache = NULL;
-	ModestCacheMgr *cache_mgr = NULL;
-	ModestTnySendQueue *send_queue = NULL;
-	GSList *send_queues = NULL, *node = NULL;
-	gboolean result = FALSE;
-	
-	g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (win), FALSE);
-	
-	/* Get send queue */
-	cache_mgr = modest_runtime_get_cache_mgr ();
-	send_queue_cache = modest_cache_mgr_get_cache (cache_mgr,
-						       MODEST_CACHE_MGR_CACHE_TYPE_SEND_QUEUE);
-	
-	g_hash_table_foreach (send_queue_cache, (GHFunc) fill_list_of_caches, &send_queues);
-	
-	for (node = send_queues; node != NULL && !result; node = g_slist_next (node)) {
-		send_queue = MODEST_TNY_SEND_QUEUE (node->data);
-		
-		/* Check if send operation is in progress */
-		result = modest_tny_send_queue_sending_in_progress (send_queue);
-	}
-       
-	return result;
-}
-
-static gboolean
 _invalid_folder_for_purge (ModestWindow *win, 
 			   ModestDimmingRule *rule)
 {
@@ -2611,7 +2584,7 @@ _invalid_folder_for_purge (ModestWindow *win,
 		folder = tny_msg_get_folder (msg);	
 		g_object_unref (msg);
 		if (folder == NULL) {
-			modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments"));
+			result = TRUE;
 			goto frees;
 		}
 	} else if (MODEST_IS_MAIN_WINDOW (win)) {
@@ -2619,7 +2592,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 {
@@ -2636,31 +2610,14 @@ _invalid_folder_for_purge (ModestWindow *win,
 		
 		if (_selected_folder_is_any_of_type (win, types, 2)) {
 			result = TRUE;
-			modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_editable_msg"));
-		} else {
-			result = FALSE;
 		}
 	} else {
-		const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account));
-		/* If it's POP then dim */
-		if (modest_protocol_info_get_transport_store_protocol (proto_str) == 
-		    MODEST_PROTOCOL_STORE_POP) {
-			TnyList *attachments = NULL;
-			gint n_selected = 0;
+		ModestProtocolType protocol_type = modest_tny_account_get_protocol_type (TNY_ACCOUNT (account));
+		/* If it's a remote folder then dim */
+		if (modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (),
+								    protocol_type,
+								    MODEST_PROTOCOL_REGISTRY_REMOTE_STORE_PROTOCOLS)) {
 			result = TRUE;
-			
-			/* TODO: This check is here to prevent a gwarning, but this looks like a logic error.
-			 * murrayc */
-			if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
-				attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win));
-				n_selected = tny_list_get_length (attachments);
-				g_object_unref (attachments);
-			}
-			
-			modest_dimming_rule_set_notification (rule, 
-							      ngettext ("mail_ib_unable_to_pure_attach_pop_mail_singular",
-									"mail_ib_unable_to_pure_attach_pop_mail_plural", 
-									n_selected));
 		}
 	}