diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-07-20 08:08:50 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-07-20 08:08:50 +0800 |
| commit | 25ea76f3a782b2cd0a9ed65216203b7d7472ef57 (patch) | |
| tree | b9fbdc13ea42b51c99ec31c54b883c78eaff132d /camel/camel-mime-part-utils.c | |
| parent | 0ce3b207745b7094c31a4713f8bc08cbe926b425 (diff) | |
| download | gsoc2013-evolution-25ea76f3a782b2cd0a9ed65216203b7d7472ef57.tar.gz gsoc2013-evolution-25ea76f3a782b2cd0a9ed65216203b7d7472ef57.tar.zst gsoc2013-evolution-25ea76f3a782b2cd0a9ed65216203b7d7472ef57.zip | |
Convert to the iconv-friendly charset names.
2001-07-19 Jeffrey Stedfast <fejj@ximian.com>
* camel-mime-filter-charset.c
(camel_mime_filter_charset_new_convert): Convert to the
iconv-friendly charset names.
* providers/imap/camel-imap-store.c (create_folder): Fixed a
compiler warning about returning without a value in a non-void
function. Blah.
* camel-mime-part.c (process_header): Pass the locale charset as
the default_charset to header_decode_string().
* camel-folder-summary.c (camel_folder_summary_format_string):
Pass the locale charset as the default_charset to
header_decode_string().
(content_info_new): Same.
* camel-mime-message.c (process_header): Pass the locale charset
as the default_charset to header_decode_string().
* camel-mime-utils.c (append_8bit): New helper function who's
purpose is similar to append_latin1() but for 8bit text that we
are assuming is not latin1.
(header_decode_text): Now takes a default_charset parameter and
calls append_8bit when appropriate.
(header_decode_string): Also takes a default_charset parameter
now.
(header_decode_mailbox): Pass NULL as the default_charset to
header_decode_string().
svn path=/trunk/; revision=11250
Diffstat (limited to 'camel/camel-mime-part-utils.c')
| -rw-r--r-- | camel/camel-mime-part-utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c index 9467efc003..1b674cf653 100644 --- a/camel/camel-mime-part-utils.c +++ b/camel/camel-mime-part-utils.c @@ -88,9 +88,9 @@ check_html_charset (CamelMimeParser *mp, CamelMimeFilterBasicType enctype) const char *data; int len; const char *val; - + state = camel_html_parser_step(hp, &data, &len); - + /* example: <META http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> */ switch(state) { @@ -184,7 +184,7 @@ simple_data_wrapper_construct_from_parser (CamelDataWrapper *dw, CamelMimeParser /* Possible Lame Mailer Alert... check the META tags for a charset */ if (!charset && header_content_type_is (ct, "text", "html")) - charset = check_html_charset(mp, enctype); + charset = check_html_charset (mp, enctype); /* if the charset is not us-ascii or utf-8, then we need to convert to utf-8 */ if (charset && !(g_strcasecmp (charset, "us-ascii") == 0 || g_strcasecmp (charset, "utf-8") == 0)) { |