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-sasl-digest-md5.c | |
| parent | f9f6af4bcef7e33543a343048e0da492d3941861 (diff) | |
| download | gsoc2013-evolution-74205e83d12157f4c3c379722a0e6736d19c13ce.tar gsoc2013-evolution-74205e83d12157f4c3c379722a0e6736d19c13ce.tar.gz gsoc2013-evolution-74205e83d12157f4c3c379722a0e6736d19c13ce.tar.bz2 gsoc2013-evolution-74205e83d12157f4c3c379722a0e6736d19c13ce.tar.lz gsoc2013-evolution-74205e83d12157f4c3c379722a0e6736d19c13ce.tar.xz 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-sasl-digest-md5.c')
| -rw-r--r-- | camel/camel-sasl-digest-md5.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c index be67d32163..7c50c4f4a7 100644 --- a/camel/camel-sasl-digest-md5.c +++ b/camel/camel-sasl-digest-md5.c @@ -2,7 +2,7 @@ /* * Authors: Jeffrey Stedfast <fejj@ximian.com> * - * Copyright 2001 Ximian, Inc. (www.ximian.com) + * Copyright 2001-2003 Ximian, Inc. (www.ximian.com) * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -20,6 +20,7 @@ * */ + #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -31,7 +32,8 @@ #include <e-util/md5-utils.h> -#include "camel-iconv.h" +#include <gal/util/e-iconv.h> + #include "camel-charset-map.h" #include "camel-mime-utils.h" #include "camel-sasl-digest-md5.h" @@ -699,18 +701,18 @@ digest_response (struct _DigestResponse *resp) const char *inbuf; iconv_t cd; - charset = camel_charset_locale_name (); + charset = e_iconv_locale_charset (); if (!charset) charset = "iso-8859-1"; - cd = camel_iconv_open (resp->charset, charset); + cd = e_iconv_open (resp->charset, charset); len = strlen (resp->username); outlen = 2 * len; /* plenty of space */ outbuf = username = g_malloc0 (outlen + 1); inbuf = resp->username; - if (cd == (iconv_t) -1 || camel_iconv (cd, &inbuf, &len, &outbuf, &outlen) == (size_t) -1) { + if (cd == (iconv_t) -1 || e_iconv (cd, &inbuf, &len, &outbuf, &outlen) == (size_t) -1) { /* We can't convert to UTF-8 - pretend we never got a charset param? */ g_free (resp->charset); resp->charset = NULL; @@ -721,7 +723,7 @@ digest_response (struct _DigestResponse *resp) } if (cd != (iconv_t) -1) - camel_iconv_close (cd); + e_iconv_close (cd); g_byte_array_append (buffer, username, strlen (username)); g_free (username); |