TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
g_object_unref (iter);
if (!modest_tny_mime_part_is_msg (mime_part) &&
- modest_tny_mime_part_is_attachment_for_modest (mime_part)) {
+ modest_tny_mime_part_is_attachment_for_modest (mime_part) &&
+ !tny_mime_part_is_purged (mime_part)) {
filename = tny_mime_part_get_filename (mime_part);
} else {
/* TODO: show any error? */
while (!tny_iterator_is_done (iter)) {
TnyMimePart *mime_part = (TnyMimePart *) tny_iterator_get_current (iter);
- if ((modest_tny_mime_part_is_attachment_for_modest (mime_part)) &&
+ if ((modest_tny_mime_part_is_attachment_for_modest (mime_part)) &&
+ !tny_mime_part_is_purged (mime_part) &&
(tny_mime_part_get_filename (mime_part) != NULL)) {
SaveMimePartPair *pair;
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_account_for_purge (ModestWindow *win, ModestDimmingRule *rule);
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);
}
}
- /* cannot purge in pop accounts */
- if (!dimmed) {
- dimmed = _invalid_account_for_purge (win, rule);
- }
-
/* cannot purge in editable drafts nor pop folders */
if (!dimmed) {
dimmed = _invalid_folder_for_purge (win, rule);
}
static gboolean
-_invalid_account_for_purge (ModestWindow *win,
- ModestDimmingRule *rule)
-{
- const gchar *account_name;
- ModestTnyAccountStore *account_store;
- TnyAccount *store_account = NULL;
- gboolean result = FALSE;
- const gchar *protocol_name;
-
- account_name = modest_window_get_active_account (win);
- if (account_name == NULL)
- goto frees;
-
- account_store = modest_runtime_get_account_store ();
- store_account = modest_tny_account_store_get_server_account (account_store, account_name, TNY_ACCOUNT_TYPE_STORE);
- if (store_account == NULL)
- goto frees;
-
- protocol_name = tny_account_get_proto (store_account);
- if (modest_protocol_info_get_transport_store_protocol (protocol_name) == MODEST_PROTOCOL_STORE_POP) {
- gint n_selected = 0;
- result = TRUE;
-
- if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
- TnyList *attachments;
- 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));
-
- }
-frees:
- if (store_account)
- g_object_unref (store_account);
- return result;
-}
-
-static gboolean
_invalid_folder_for_purge (ModestWindow *win,
ModestDimmingRule *rule)
{