From becf944b42e72175079e9b975ab631e9adc91b43 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 20 Mar 2003 16:43:29 +0000 Subject: Handle raw 8-bit From data "correctly". (The same way we handle raw 8-bit Subject data.) * camel-mime-utils.c (header_decode_mailbox): Take a charset arg and pass it to header_decode_string. (header_decode_address): Take a charset arg and pass it to header_decode_mailbox. (header_mailbox_decode): Likewise. (header_address_decode): Take a charset arg and pass it to header_decode_address. * camel-folder-summary.c (summary_format_address): Take a charset arg and pass to header_address_decode. (message_info_new, camel_message_info_new_from_header): Pass charset to summary_format_address * camel-internet-address.c (internet_decode): Update for header_address_decode change. (Unfortunately we don't have a charset to pass here.) * camel-mime-message.c (camel_mime_message_build_mbox_from): Move this here from camel-mbox-summary since the same functionality is needed by evolution-mail too (and update for header_address_decode change) * providers/local/camel-mbox-summary.c (camel_mbox_summary_build_from): Moved to CamelMimeMessage svn path=/trunk/; revision=20430 --- camel/camel-folder-summary.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'camel/camel-folder-summary.c') diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c index b9645754cb..a66026f0ab 100644 --- a/camel/camel-folder-summary.c +++ b/camel/camel-folder-summary.c @@ -1467,14 +1467,14 @@ static CamelMessageContentInfo * content_info_new_from_message(CamelFolderSummar } static char * -summary_format_address(struct _header_raw *h, const char *name) +summary_format_address(struct _header_raw *h, const char *name, const char *charset) { struct _header_address *addr; const char *text; char *ret; text = header_raw_find (&h, name, NULL); - addr = header_address_decode (text); + addr = header_address_decode (text, charset); if (addr) { ret = header_address_list_format (addr); header_address_list_clear (&addr); @@ -1579,9 +1579,9 @@ message_info_new(CamelFolderSummary *s, struct _header_raw *h) charset = charset ? e_iconv_charset_name (charset) : NULL; subject = summary_format_string(h, "subject", charset); - from = summary_format_address(h, "from"); - to = summary_format_address(h, "to"); - cc = summary_format_address(h, "cc"); + from = summary_format_address(h, "from", charset); + to = summary_format_address(h, "to", charset); + cc = summary_format_address(h, "cc", charset); mlist = header_raw_check_mailing_list(&h); if (ct) @@ -2566,9 +2566,9 @@ camel_message_info_new_from_header (struct _header_raw *header) charset = charset ? e_iconv_charset_name (charset) : NULL; subject = summary_format_string(header, "subject", charset); - from = summary_format_address(header, "from"); - to = summary_format_address(header, "to"); - cc = summary_format_address(header, "cc"); + from = summary_format_address(header, "from", charset); + to = summary_format_address(header, "to", charset); + cc = summary_format_address(header, "cc", charset); date = header_raw_find(&header, "date", NULL); mlist = header_raw_check_mailing_list(&header); -- cgit v1.2.3