diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-07-20 07:11:13 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-07-20 07:11:13 +0800 |
| commit | 49e81a0bda0d8914a4785d73e366b680186e9406 (patch) | |
| tree | f2d637e244fdc12eb9b822b0586140c879b85e71 /camel/camel-pgp-context.c | |
| parent | d20ac81f624dd26da52a921add73cb96f96cddbb (diff) | |
| download | gsoc2013-evolution-49e81a0bda0d8914a4785d73e366b680186e9406.tar gsoc2013-evolution-49e81a0bda0d8914a4785d73e366b680186e9406.tar.gz gsoc2013-evolution-49e81a0bda0d8914a4785d73e366b680186e9406.tar.bz2 gsoc2013-evolution-49e81a0bda0d8914a4785d73e366b680186e9406.tar.lz gsoc2013-evolution-49e81a0bda0d8914a4785d73e366b680186e9406.tar.xz gsoc2013-evolution-49e81a0bda0d8914a4785d73e366b680186e9406.tar.zst gsoc2013-evolution-49e81a0bda0d8914a4785d73e366b680186e9406.zip | |
Modified to treat the return value from camel_charset_locale_name() as a
2001-07-19 Jeffrey Stedfast <fejj@ximian.com>
* camel-pgp-context.c (pgp_verify): Modified to treat the return
value from camel_charset_locale_name() as a const char*.
* camel-sasl-digest-md5.c (digest_response): Modified to treat the
return value from camel_charset_locale_name() as a const char*.
* camel-charset-map.c (camel_charset_locale_name): Modify to
return const char* by returning the static locale_charset which is
created inside of camel_charset_map_init().
(camel_charset_map_init): Find the locale charset here and set the
static variable.
svn path=/trunk/; revision=11245
Diffstat (limited to 'camel/camel-pgp-context.c')
| -rw-r--r-- | camel/camel-pgp-context.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/camel/camel-pgp-context.c b/camel/camel-pgp-context.c index cde9f76d25..3f377909f7 100644 --- a/camel/camel-pgp-context.c +++ b/camel/camel-pgp-context.c @@ -981,7 +981,8 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream, } if (diagnostics) { - char *locale, *desc, *outbuf; + const char *locale; + char *desc, *outbuf; size_t inlen, outlen; iconv_t cd; @@ -992,10 +993,9 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream, locale = camel_charset_locale_name (); if (!locale) - locale = g_strdup ("iso-8859-1"); + locale = "iso-8859-1"; cd = iconv_open ("UTF-8", locale); - g_free (locale); if (cd != (iconv_t) -1) { const char *inbuf; |