diff options
Diffstat (limited to 'camel/camel-mime-filter-charset.c')
| -rw-r--r-- | camel/camel-mime-filter-charset.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c index bb9dd06acb..4154d44bea 100644 --- a/camel/camel-mime-filter-charset.c +++ b/camel/camel-mime-filter-charset.c @@ -24,6 +24,8 @@ #include <string.h> #include <errno.h> +#include <gal/util/e-iconv.h> + #include "camel-mime-filter-charset.h" #include "camel-charset-map.h" @@ -61,7 +63,7 @@ camel_mime_filter_charset_finalize(CamelObject *o) g_free(f->from); g_free(f->to); if (f->ic != (iconv_t)-1) { - camel_charset_iconv_close(f->ic); + e_iconv_close(f->ic); f->ic = (iconv_t) -1; } } @@ -231,10 +233,7 @@ 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_to_iconv (from_charset); - to_charset = camel_charset_to_iconv (to_charset); - - new->ic = camel_charset_iconv_open (to_charset, from_charset); + new->ic = e_iconv_open (to_charset, from_charset); if (new->ic == (iconv_t) -1) { g_warning("Cannot create charset conversion from %s to %s: %s", from_charset, to_charset, strerror(errno)); camel_object_unref ((CamelObject *)new); |