aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/mail-callbacks.c11
2 files changed, 13 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 51df80a6c2..1c6011e2d2 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-10 Jeffrey Stedfast <fejj@ximian.com>
+
+ * mail-callbacks.c (do_edit_messages): Remove some mailer-set
+ headers. Fixes bug #9462.
+
2001-09-10 Dan Winship <danw@ximian.com>
* mail-callbacks.c (composer_get_message): Fix obvious dumb
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index f216410546..46e6ccaa43 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1469,16 +1469,21 @@ toggle_as_important (BonoboUIComponent *uih, void *user_data, const char *path)
}
static void
-do_edit_messages(CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
+do_edit_messages (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, void *data)
{
/*FolderBrowser *fb = data;*/
int i;
for (i = 0; i < messages->len; i++) {
EMsgComposer *composer;
-
+ XEvolution *hdrs;
+
+ hdrs = mail_tool_remove_xevolution_headers (messages->pdata[i]);
+ mail_tool_destroy_xevolution (hdrs);
+ camel_medium_remove_header (CAMEL_MEDIUM (messages->pdata[i]), "X-Mailer");
+
composer = e_msg_composer_new_with_message (messages->pdata[i]);
-
+
if (composer) {
gtk_signal_connect (GTK_OBJECT (composer), "send",
composer_send_cb, NULL);