pretty simple fix -- Jeffrey Stedfast Evolution Hacker - Novell, Inc. fejj ximian com - www.novell.com
? 33933.patch
? 55303-2.patch
? 55303.patch
? 59717.patch
? 62109.patch
? 62377.patch
? 62665.patch
? 62771-mailer.patch
? 62812.patch
? 63177.patch
? 64974.patch
? 65448.patch
? 70394.patch
? default/zh_CN/Makefile
? default/zh_CN/Makefile.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3604
diff -u -r1.3604 ChangeLog
--- ChangeLog 11 Mar 2005 01:27:27 -0000 1.3604
+++ ChangeLog 16 Mar 2005 21:32:30 -0000
@@ -1,3 +1,9 @@
+2005-03-16 Jeffrey Stedfast <fejj novell com>
+
+ * em-format-html.c (efh_format_headers): Don't show multiple
+ "Mailer" headers even if multiple x-mailer/user-agent/whatever
+ headers exist. Fixes bug #70394.
+
2005-03-10 Not Zed <NotZed Ximian com>
** See bug #73293
Index: em-format-html.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html.c,v
retrieving revision 1.75
diff -u -r1.75 em-format-html.c
--- em-format-html.c 2 Mar 2005 05:23:45 -0000 1.75
+++ em-format-html.c 16 Mar 2005 21:32:30 -0000
@@ -1639,6 +1639,8 @@
header = header->next;
}
} else {
+ int mailer_shown = FALSE;
+
while (h->next) {
int mailer;
@@ -1646,13 +1648,14 @@
mailer = !g_ascii_strcasecmp (h->name, "X-Evolution-Mailer");
while (header) {
- if (mailer && (!g_ascii_strcasecmp (header->name, "X-Mailer") ||
+ if (!mailer_shown && mailer && (!g_ascii_strcasecmp (header->name, "X-Mailer") ||
!g_ascii_strcasecmp (header->name, "User-Agent") ||
!g_ascii_strcasecmp (header->name, "X-Newsreader"))) {
struct _camel_header_raw xmailer;
xmailer.name = "X-Evolution-Mailer";
xmailer.value = header->value;
+ mailer_shown = TRUE;
efh_format_header (emf, stream, part, &xmailer, h->flags, charset);
if (strstr(header->value, "Evolution"))
Attachment:
smime.p7s
Description: S/MIME cryptographic signature