aboutsummaryrefslogtreecommitdiffstats
path: root/mail/mail-ops.c
diff options
context:
space:
mode:
Diffstat (limited to 'mail/mail-ops.c')
-rw-r--r--mail/mail-ops.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 1d7c7b710d..d0c5e272a1 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -36,7 +36,6 @@
#include <errno.h>
#include <libgnome/gnome-exec.h>
#include <gal/util/e-util.h>
-#include <libgnome/gnome-i18n.h>
#include <camel/camel-mime-filter-from.h>
#include <camel/camel-stream-filter.h>
@@ -527,8 +526,8 @@ mail_send_message (CamelMimeMessage *message, const char *destination,
}
/* post-process */
- info = camel_message_info_new(NULL);
- camel_message_info_set_flags(info, CAMEL_MESSAGE_SEEN, ~0);
+ info = camel_message_info_new ();
+ info->flags = CAMEL_MESSAGE_SEEN;
if (sent_folder_uri) {
folder = mail_tool_uri_to_folder (sent_folder_uri, 0, ex);
@@ -658,11 +657,10 @@ send_queue_send(struct _mail_msg *mm)
CamelMessageInfo *info;
info = camel_folder_get_message_info (m->queue, uids->pdata[i]);
- if (info) {
- if ((camel_message_info_flags(info) & CAMEL_MESSAGE_DELETED) == 0)
- send_uids->pdata[j++] = uids->pdata[i];
- camel_folder_free_message_info(m->queue, info);
- }
+ if (info && info->flags & CAMEL_MESSAGE_DELETED)
+ continue;
+
+ send_uids->pdata[j++] = uids->pdata[i];
}
send_uids->len = j;