diff options
| -rw-r--r-- | camel/ChangeLog | 6 | ||||
| -rw-r--r-- | camel/camel-charset-map.c | 6 | ||||
| -rw-r--r-- | camel/camel-charset-map.h | 2 | ||||
| -rw-r--r-- | camel/camel-mime-filter-charset.c | 4 | ||||
| -rw-r--r-- | camel/camel-mime-part-utils.c | 2 | ||||
| -rw-r--r-- | camel/camel-mime-utils.c | 4 |
6 files changed, 15 insertions, 9 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog index f59951c452..144b7b7f52 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2001-07-20 Not Zed <NotZed@Ximian.com> + + * camel-charset-map.c (camel_charset_get_iconv_friendly_name): + renamed to camel_charset_to_iconv() to make it just a little more + consistent and not so long & fixed callers. + 2001-07-19 Jeffrey Stedfast <fejj@ximian.com> * camel-mime-filter-charset.c diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c index c007658553..5ad5a249af 100644 --- a/camel/camel-charset-map.c +++ b/camel/camel-charset-map.c @@ -228,7 +228,7 @@ struct { { "iso8859-1", "iso-8859-1" }, /* the above mostly serves as an example for iso-style charsets, but we have code that will populate the iso-*'s if/when they - show up in camel_charset_map_get_iconv_friendly_name() so I'm + show up in camel_charset_map_to_iconv() so I'm not going to bother putting them all in here... */ { "windows-cp1251", "cp1251" }, { "windows-1251", "cp1251" }, @@ -386,7 +386,7 @@ camel_charset_locale_name (void) } const char * -camel_charset_get_iconv_friendly_name (const char *name) +camel_charset_to_iconv (const char *name) { const char *charset; @@ -415,7 +415,7 @@ camel_charset_get_iconv_friendly_name (const char *name) } ICONV_CHARSETS_UNLOCK (); - g_warning ("camel_charset_get_iconv_friendly_name (\"%s\") => \"%s\"", name, charset); + g_warning ("camel_charset_to_iconv (\"%s\") => \"%s\"", name, charset); return charset; } diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h index 0a0efb1cd3..0bf2c706c5 100644 --- a/camel/camel-charset-map.h +++ b/camel/camel-charset-map.h @@ -39,6 +39,6 @@ const char *camel_charset_best(const char *in, int len); const char *camel_charset_locale_name (void); -const char *camel_charset_get_iconv_friendly_name (const char *name); +const char *camel_charset_to_iconv (const char *name); #endif /* ! _CAMEL_CHARSET_MAP_H */ diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c index d3fb126970..4e59478683 100644 --- a/camel/camel-mime-filter-charset.c +++ b/camel/camel-mime-filter-charset.c @@ -231,8 +231,8 @@ camel_mime_filter_charset_new_convert (const char *from_charset, const char *to_ { CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET (camel_object_new (camel_mime_filter_charset_get_type ())); - from_charset = camel_charset_get_iconv_friendly_name (from_charset); - to_charset = camel_charset_get_iconv_friendly_name (to_charset); + from_charset = camel_charset_to_iconv (from_charset); + to_charset = camel_charset_to_iconv (to_charset); new->ic = iconv_open (to_charset, from_charset); if (new->ic == (iconv_t) -1) { diff --git a/camel/camel-mime-part-utils.c b/camel/camel-mime-part-utils.c index 1b674cf653..d1c41377d1 100644 --- a/camel/camel-mime-part-utils.c +++ b/camel/camel-mime-part-utils.c @@ -104,7 +104,7 @@ check_html_charset (CamelMimeParser *mp, CamelMimeFilterBasicType enctype) && (ct = header_content_type_decode(val))) { charset = header_content_type_param(ct, "charset"); if (charset) - charset = camel_charset_get_iconv_friendly_name (charset); + charset = camel_charset_to_iconv (charset); header_content_type_unref(ct); } break; diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c index 594c1de05e..e5c90dabd0 100644 --- a/camel/camel-mime-utils.c +++ b/camel/camel-mime-utils.c @@ -954,7 +954,7 @@ rfc2047_decode_word(const char *in, int len) memcpy (encname, in + 2, tmplen); encname[tmplen] = '\0'; - charset = camel_charset_get_iconv_friendly_name (encname); + charset = camel_charset_to_iconv (encname); inbuf = decword; @@ -1811,7 +1811,7 @@ rfc2184_decode (const char *in, int len) return NULL; encoding = g_strndup (in, inptr - in); - charset = camel_charset_get_iconv_friendly_name (encoding); + charset = camel_charset_to_iconv (encoding); g_free (encoding); inptr = memchr (inptr + 1, '\'', inend - inptr - 1); |