aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/mail-callbacks.c26
-rw-r--r--mail/mail-ops.c4
3 files changed, 19 insertions, 14 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 8df940c6d8..9f00220887 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,7 +1,8 @@
2001-03-10 Jeffrey Stedfast <fejj@ximian.com>
* mail-ops.c (send_queue_send): Remove our X-Evolution header
- before we send.
+ before we send. Also don't send messages that are marked for
+ deletion.
2001-03-09 Jeffrey Stedfast <fejj@ximian.com>
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 36213a2c8a..31a3b5513d 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -939,21 +939,21 @@ flag_messages(FolderBrowser *fb, guint32 mask, guint32 set)
MessageList *ml = fb->message_list;
GPtrArray *uids;
int i;
-
+
if (ml->folder == NULL)
return;
-
+
/* could just use specific callback but i'm lazy */
uids = g_ptr_array_new ();
message_list_foreach (ml, enumerate_msg, uids);
- camel_folder_freeze(ml->folder);
- for (i=0;i<uids->len;i++) {
- camel_folder_set_message_flags(ml->folder, uids->pdata[i], mask, set);
- g_free(uids->pdata[i]);
+ camel_folder_freeze (ml->folder);
+ for (i = 0; i < uids->len; i++) {
+ camel_folder_set_message_flags (ml->folder, uids->pdata[i], mask, set);
+ g_free (uids->pdata[i]);
}
- camel_folder_thaw(ml->folder);
-
- g_ptr_array_free(uids, TRUE);
+ camel_folder_thaw (ml->folder);
+
+ g_ptr_array_free (uids, TRUE);
}
void
@@ -980,11 +980,11 @@ do_edit_messages(CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void
{
/*FolderBrowser *fb = data;*/
int i;
-
- for (i=0; i<messages->len; i++) {
+
+ for (i = 0; i < messages->len; i++) {
EMsgComposer *composer;
-
- composer = e_msg_composer_new_with_message(messages->pdata[i]);
+
+ composer = e_msg_composer_new_with_message (messages->pdata[i]);
if (composer) {
gtk_signal_connect (GTK_OBJECT (composer), "send",
composer_send_cb, NULL);
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 8766339c6d..49f39e6b0b 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -633,6 +633,10 @@ send_queue_send(struct _mail_msg *mm)
report_status (m, CAMEL_FILTER_STATUS_START, pc, "Sending message %d of %d", i+1, uids->len);
+ info = camel_folder_get_message_info (m->queue, uids->pdata[i]);
+ if (info && info->flags & CAMEL_MESSAGE_DELETED)
+ continue;
+
message = camel_folder_get_message (m->queue, uids->pdata[i], &mm->ex);
if (camel_exception_is_set (&mm->ex))
break;