diff options
| author | 1 <NotZed@Ximian.com> | 2001-10-12 06:08:20 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2001-10-12 06:08:20 +0800 |
| commit | a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13 (patch) | |
| tree | ae2d252c33e30e674ad58be332f3cd98e409e3db /camel/camel-pgp-context.c | |
| parent | 736e73548cb39a7aaad61f01704ac60ccb74f79e (diff) | |
| download | gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar.gz gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar.bz2 gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar.lz gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar.xz gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.tar.zst gsoc2013-evolution-a5fa3f992dd32fdf99bfcf550a8ce62df2b74d13.zip | |
Removed charset/locale charset lookup and iconv_open/close functions,
2001-10-11 <NotZed@Ximian.com>
* camel-charset-map.[ch]: Removed charset/locale charset lookup
and iconv_open/close functions, moved to gal. Fixed all callers.
svn path=/trunk/; revision=13602
Diffstat (limited to 'camel/camel-pgp-context.c')
| -rw-r--r-- | camel/camel-pgp-context.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c index 180a1a10e2..575b6006ac 100644 --- a/camel/camel-pgp-context.c +++ b/camel/camel-pgp-context.c @@ -52,6 +52,7 @@ #include <iconv.h> #include <gal/unicode/gunicode.h> +#include <gal/util/e-iconv.h> #define d(x) @@ -999,11 +1000,11 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream, desc = outbuf = g_new (unsigned char, outlen + 1); - locale = camel_charset_locale_name (); + locale = e_iconv_locale_charset(); if (!locale) locale = "iso-8859-1"; - cd = camel_charset_iconv_open ("UTF-8", locale); + cd = e_iconv_open ("UTF-8", locale); if (cd != (iconv_t) -1) { const char *inbuf; int ret; @@ -1013,7 +1014,7 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream, if (ret >= 0) { iconv (cd, NULL, 0, &outbuf, &outlen); } - camel_charset_iconv_close (cd); + e_iconv_close (cd); *outbuf = '\0'; } else { |