diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2003-02-26 03:43:22 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-02-26 03:43:22 +0800 |
commit | 74205e83d12157f4c3c379722a0e6736d19c13ce (patch) | |
tree | cc32c6df4eec053249dfe58764e5349306577088 /camel/camel-mime-filter-charset.c | |
parent | f9f6af4bcef7e33543a343048e0da492d3941861 (diff) | |
download | gsoc2013-evolution-74205e83d12157f4c3c379722a0e6736d19c13ce.tar.gz gsoc2013-evolution-74205e83d12157f4c3c379722a0e6736d19c13ce.tar.zst gsoc2013-evolution-74205e83d12157f4c3c379722a0e6736d19c13ce.zip |
Same as the ones below.
2003-02-25 Jeffrey Stedfast <fejj@ximian.com>
* camel-mime-message.c: Same as the ones below.
* camel-mime-part.c: Reverted back to pre-camel-iconv
* camel-filter-search.c: Same as below.
* camel-folder-summary.c: Reverted back to pre-camel-iconv
* camel.c (camel_init): Reverted to pre-camel-iconv
* camel-charset-map.c (camel_charset_locale_name): Removed (part
of the revert).
(camel_charset_canonical_name): Same.
* camel-mime-filter-charset.c: Revert back to using e_iconv from GAL.
* camel-mime-part-utils.c: Revert back to using e_iconv from GAL.
* camel-mime-utils.c: Revert back to using e_iconv from GAL.
* camel-sasl-digest-md5.c: Revert back to using e-iconv from GAL.
svn path=/trunk/; revision=20056
Diffstat (limited to 'camel/camel-mime-filter-charset.c')
-rw-r--r-- | camel/camel-mime-filter-charset.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c index 0e1c111786..6d5bb4f000 100644 --- a/camel/camel-mime-filter-charset.c +++ b/camel/camel-mime-filter-charset.c @@ -27,9 +27,10 @@ #include <string.h> #include <errno.h> +#include <gal/util/e-iconv.h> + #include "camel-mime-filter-charset.h" #include "camel-charset-map.h" -#include "camel-iconv.h" #define d(x) @@ -65,7 +66,7 @@ camel_mime_filter_charset_finalize(CamelObject *o) g_free(f->from); g_free(f->to); if (f->ic != (iconv_t) -1) { - camel_iconv_close (f->ic); + e_iconv_close (f->ic); f->ic = (iconv_t) -1; } } @@ -81,7 +82,7 @@ reset(CamelMimeFilter *mf) /* what happens with the output bytes if this resets the state? */ if (f->ic != (iconv_t) -1) { buffer = buf; - camel_iconv (f->ic, NULL, 0, &buffer, &outlen); + e_iconv (f->ic, NULL, 0, &buffer, &outlen); } } @@ -105,7 +106,7 @@ complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, if (inleft > 0) { do { - converted = camel_iconv (charset->ic, &inbuf, &inleft, &outbuf, &outleft); + converted = e_iconv (charset->ic, &inbuf, &inleft, &outbuf, &outleft); if (converted == (size_t) -1) { if (errno == E2BIG) { /* @@ -145,7 +146,7 @@ complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, } /* flush the iconv conversion */ - camel_iconv (charset->ic, NULL, NULL, &outbuf, &outleft); + e_iconv (charset->ic, NULL, NULL, &outbuf, &outleft); *out = mf->outbuf; *outlen = mf->outsize - outleft; @@ -179,7 +180,7 @@ filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, s inleft = len; do { - converted = camel_iconv (charset->ic, &inbuf, &inleft, &outbuf, &outleft); + converted = e_iconv (charset->ic, &inbuf, &inleft, &outbuf, &outleft); if (converted == (size_t) -1) { if (errno == E2BIG || errno == EINVAL) break; @@ -259,7 +260,7 @@ camel_mime_filter_charset_new_convert (const char *from_charset, const char *to_ new = CAMEL_MIME_FILTER_CHARSET (camel_object_new (camel_mime_filter_charset_get_type ())); - new->ic = camel_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, g_strerror (errno)); |