diff options
author | Jeffrey Stedfast <fejj@ximian.com> | 2003-02-21 05:04:19 +0800 |
---|---|---|
committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2003-02-21 05:04:19 +0800 |
commit | abada7e2cd02933caa7a2643c0771b3ee7a63cfe (patch) | |
tree | def1c8730c5190323d408d2058a837da47bdc1fb /camel/camel-mime-filter-charset.c | |
parent | 08c781ab889611a7b9ca1605b36361032cc80f7d (diff) | |
download | gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar.gz gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar.bz2 gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar.lz gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar.xz gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.tar.zst gsoc2013-evolution-abada7e2cd02933caa7a2643c0771b3ee7a63cfe.zip |
Call camel_iconv_init(). (camel_shutdown): Call camel_iconv_shutdown().
2003-02-20 Jeffrey Stedfast <fejj@ximian.com>
* camel.c (camel_init): Call camel_iconv_init().
(camel_shutdown): Call camel_iconv_shutdown().
* camel-sasl-digest-md5.c (digest_response): Updated to use
camel-iconv and the new camel-charset-map functions.
* camel-mime-utils.c: Updated to use camel-iconv and the new
camel-charset-map functions.
* camel-mime-part-utils.c (check_html_charset): Use
camel_charset_canonical_name() instead of e_iconv_charset_name()
which is longer available.
(convert_buffer): Use camel-iconv.
(simple_data_wrapper_construct_from_parser): Since
camel_charset_iso_to_windows() returns the charset in it's
canonical format, no need to re-canonicalise it.
* camel-mime-part.c (process_header): Use
camel_charset_canonical_name() instead of e_iconv_charset_name()
which is longer available.
* camel-mime-message.c (process_header): Use
camel_charset_canonical_name() instead of e_iconv_charset_name()
which is longer available.
* camel-mime-filter-charset.c: Use camel-iconv.
* camel-folder-summary.c (message_info_new): Use
camel_charset_canonical_name() instead of e_iconv_charset_name()
which is longer available.
(content_info_new): Use camel_charset_locale_name().
(camel_message_info_new_from_header): Same as message_info_new().
* camel-search-private.c: Use g_alloca() instead of alloca().
* camel-filter-search.c (check_header): Use
camel_charset_canonical_name() instead of e_iconv_charset_name()
which is longer available.
* camel-charset-map.c (camel_charset_locale_name): New function,
replaces e_iconv_locale_charset().
(camel_charset_canonical_name): New function, similar to
e_iconv_charset_name() but instead of returning the iconv-friendly
name, it returns the canonical name. (g_iconv will do the
iconv-friendly name conversions for us).
svn path=/trunk/; revision=19977
Diffstat (limited to 'camel/camel-mime-filter-charset.c')
-rw-r--r-- | camel/camel-mime-filter-charset.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/camel/camel-mime-filter-charset.c b/camel/camel-mime-filter-charset.c index f8eafa9633..0e1c111786 100644 --- a/camel/camel-mime-filter-charset.c +++ b/camel/camel-mime-filter-charset.c @@ -20,15 +20,16 @@ */ -#include <iconv.h> +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #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) @@ -63,8 +64,8 @@ camel_mime_filter_charset_finalize(CamelObject *o) g_free(f->from); g_free(f->to); - if (f->ic != (iconv_t)-1) { - e_iconv_close(f->ic); + if (f->ic != (iconv_t) -1) { + camel_iconv_close (f->ic); f->ic = (iconv_t) -1; } } @@ -76,11 +77,11 @@ reset(CamelMimeFilter *mf) char buf[16]; char *buffer; size_t outlen = 16; - + /* what happens with the output bytes if this resets the state? */ if (f->ic != (iconv_t) -1) { buffer = buf; - e_iconv(f->ic, NULL, 0, &buffer, &outlen); + camel_iconv (f->ic, NULL, 0, &buffer, &outlen); } } @@ -104,7 +105,7 @@ complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, if (inleft > 0) { do { - converted = e_iconv (charset->ic, &inbuf, &inleft, &outbuf, &outleft); + converted = camel_iconv (charset->ic, &inbuf, &inleft, &outbuf, &outleft); if (converted == (size_t) -1) { if (errno == E2BIG) { /* @@ -144,7 +145,7 @@ complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, } /* flush the iconv conversion */ - e_iconv (charset->ic, NULL, NULL, &outbuf, &outleft); + camel_iconv (charset->ic, NULL, NULL, &outbuf, &outleft); *out = mf->outbuf; *outlen = mf->outsize - outleft; @@ -178,7 +179,7 @@ filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, s inleft = len; do { - converted = e_iconv (charset->ic, &inbuf, &inleft, &outbuf, &outleft); + converted = camel_iconv (charset->ic, &inbuf, &inleft, &outbuf, &outleft); if (converted == (size_t) -1) { if (errno == E2BIG || errno == EINVAL) break; @@ -248,19 +249,21 @@ camel_mime_filter_charset_init (CamelMimeFilterCharset *obj) CamelMimeFilterCharset * camel_mime_filter_charset_new (void) { - CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET (camel_object_new (camel_mime_filter_charset_get_type ())); - return new; + return CAMEL_MIME_FILTER_CHARSET (camel_object_new (camel_mime_filter_charset_get_type ())); } CamelMimeFilterCharset * camel_mime_filter_charset_new_convert (const char *from_charset, const char *to_charset) { - CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET (camel_object_new (camel_mime_filter_charset_get_type ())); + CamelMimeFilterCharset *new; + + new = CAMEL_MIME_FILTER_CHARSET (camel_object_new (camel_mime_filter_charset_get_type ())); - new->ic = e_iconv_open (to_charset, from_charset); + new->ic = camel_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); + g_warning ("Cannot create charset conversion from %s to %s: %s", + from_charset, to_charset, g_strerror (errno)); + camel_object_unref (new); new = NULL; } else { new->from = g_strdup (from_charset); |