diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/e-mail-reader.c | 2 | ||||
| -rw-r--r-- | mail/e-mail-session.h | 1 | ||||
| -rw-r--r-- | mail/em-folder-properties.c | 2 | ||||
| -rw-r--r-- | mail/mail-ops.c | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 8432e3388b..2c1bbb2fc8 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -464,7 +464,7 @@ action_mail_remove_attachments_cb (GtkAction *action, EMailReader *reader) /* make a copy of the message */ camel_message_info_set_flags (newinfo, flags, flags); camel_folder_append_message_sync (folder, message, newinfo, NULL, NULL, &error); - + if (!error) { /* marked the original message deleted */ camel_message_info_set_flags (info, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED); diff --git a/mail/e-mail-session.h b/mail/e-mail-session.h index f9cab970cc..99c1b77d7c 100644 --- a/mail/e-mail-session.h +++ b/mail/e-mail-session.h @@ -110,7 +110,6 @@ CamelFolder * e_mail_session_uri_to_folder_finish GAsyncResult *result, GError **error); - /*** Legacy API ***/ void mail_session_flush_filter_log (EMailSession *session); diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c index 8679fd1dc1..8b454d21a2 100644 --- a/mail/em-folder-properties.c +++ b/mail/em-folder-properties.c @@ -248,7 +248,7 @@ emfp_dialog_got_folder_quota (CamelFolder *folder, client = gconf_client_get_default (); key = "/apps/evolution/mail/display/show_deleted"; - hide_deleted = !gconf_client_get_bool(client, key, NULL); + hide_deleted = !gconf_client_get_bool (client, key, NULL); g_object_unref (client); /* diff --git a/mail/mail-ops.c b/mail/mail-ops.c index 3da4f7a085..24826afd10 100644 --- a/mail/mail-ops.c +++ b/mail/mail-ops.c @@ -1797,7 +1797,7 @@ expunge_pop3_stores (CamelFolder *expunging, EMailSession *session, GCancellable if (!info) continue; - + if ((camel_message_info_flags (info) & CAMEL_MESSAGE_DELETED) != 0) { CamelMimeMessage *msg; GError *local_error = NULL; |