X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=553b5ae751625cb9c0962ce89ea4b67d50e391b9;hp=6891397aa6459a679962615027cc72e2176728c1;hb=eaa47d5033f37d2210cb277919b8239d13dc000d;hpb=8ebeb00230a8480cd695625b26db8a48882617dc

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 6891397..553b5ae 100644
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -83,7 +83,7 @@ static gboolean _selected_folder_has_subfolder_with_same_name (ModestWindow *win
 static void fill_list_of_caches (gpointer key, gpointer value, gpointer userdata);
 static gboolean _send_receive_in_progress (ModestWindow *win);
 static gboolean _msgs_send_in_progress (void);
-static gboolean _all_msgs_in_sending_status (ModestHeaderView *header_view);
+static gboolean _all_msgs_in_sending_status (ModestHeaderView *header_view) G_GNUC_UNUSED;
 
 static DimmedState *
 _define_main_window_dimming_state (ModestMainWindow *window)
@@ -1438,7 +1438,7 @@ modest_ui_dimming_rules_on_save_attachments (ModestWindow *win, gpointer user_da
 	dimmed = _invalid_attach_selected (win, FALSE, FALSE, FALSE, rule);
 
 	if (!dimmed) {
-		dimmed = _purged_attach_selected (win, TRUE);
+		dimmed = _purged_attach_selected (win, TRUE, NULL);
 		if (dimmed) {
 			modest_dimming_rule_set_notification (rule, _("mail_ib_attach_not_local"));
 		}
@@ -1469,25 +1469,6 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_
 		dimmed = _invalid_attach_selected (win, FALSE, FALSE, TRUE, NULL);
 		if (dimmed)
 			modest_dimming_rule_set_notification (rule, _("FIXME:no attachment selected"));
-
-		if (!dimmed) {
-			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) {