Re: [evolution-patches] fix for bug #62109

[Not Zed <notzed ximian com>]

looks good

On Wed, 2005-02-23 at 13:59 -0500, Jeffrey Stedfast wrote:

http://bugzilla.ximian.com/show_bug.cgi?id=62109

simple fix

text/plain attachment (62109.patch)

? 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
? default/zh_CN/Makefile
? default/zh_CN/Makefile.in
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3586
diff -u -r1.3586 ChangeLog
--- ChangeLog	23 Feb 2005 07:13:46 -0000	1.3586
+++ ChangeLog	23 Feb 2005 19:00:03 -0000
@@ -1,3 +1,10 @@
+2005-02-23  Jeffrey Stedfast  <fejj novell com>
+
+	* em-format-html.c (efh_format_header): Don't use the pre-UTF-8
+	converted subject header string from the CamelMimeMessage object,
+	decode it ourselves using the the user's override charset. Fixes
+	bug #62109.
+
 2005-02-22  Not Zed  <NotZed Ximian com>
 
 	* em-account-editor.c (emae_send_page): fix argument order to
Index: em-format-html.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-format-html.c,v
retrieving revision 1.73
diff -u -r1.73 em-format-html.c
--- em-format-html.c	31 Jan 2005 07:28:03 -0000	1.73
+++ em-format-html.c	23 Feb 2005 19:00:03 -0000
@@ -1529,7 +1529,7 @@
 		
 		flags |= EM_FORMAT_HEADER_BOLD | EM_FORMAT_HTML_HEADER_HTML;
 	} else if (!strcmp(name, "subject")) {
-		txt = camel_mime_message_get_subject(msg);
+		txt = value = camel_header_decode_string (header->value, charset);
 		label = _("Subject");
 		flags |= EM_FORMAT_HEADER_BOLD;
 	} else if (!strcmp(name, "x-evolution-mailer")) {