aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog3
-rw-r--r--mail/mail-ops.c9
2 files changed, 9 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 0726c67148..cf63258d78 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,8 @@
2001-01-21 Jeffrey Stedfast <fejj@ximian.com>
+ * mail-ops.c (do_send_queue): Remove the X-Evolution header before
+ we send.
+
* mail-crypto.c (pgp_mime_part_sign): Don't forget to unref the
filters.
(pgp_mime_part_verify): Same.
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index c6db157afb..3391001fae 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -714,13 +714,16 @@ do_send_queue (gpointer in_data, gpointer op_data, CamelException *ex)
message = camel_folder_get_message (input->folder_queue, uids->pdata[i], ex);
if (camel_exception_is_set (ex))
break;
-
+
+ /* Remove the X-Evolution header */
+ camel_medium_remove_header (CAMEL_MEDIUM (message), "X-Evolution");
+
set_x_mailer (message);
-
+
camel_mime_message_set_date (message, CAMEL_MESSAGE_DATE_CURRENT, 0);
/* Get the preferred transport URI */
- transport_url = camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Transport");
+ transport_url = (char *) camel_medium_get_header (CAMEL_MEDIUM (message), "X-Evolution-Transport");
if (transport_url) {
transport_url = g_strdup (transport_url);
g_strstrip (transport_url);