aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/camel-iconv.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 73f13758fa..8922aa8a7c 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-24 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-iconv.c (iconv_cache_bucket_expire): Use g_iconv_close()
+ here, missed this before.
+ (camel_iconv): Might as well call g_iconv here even though it just
+ calls iconv directly.
+
2003-02-21 Jeffrey Stedfast <fejj@ximian.com>
* camel-iconv.c (camel_iconv_charset_name): New function...back
diff --git a/camel/camel-iconv.c b/camel/camel-iconv.c
index 439adf2df2..de97052669 100644
--- a/camel/camel-iconv.c
+++ b/camel/camel-iconv.c
@@ -201,7 +201,7 @@ iconv_cache_bucket_expire (struct _iconv_cache_bucket *bucket)
}
g_free (bucket->key);
- iconv_close (bucket->cd);
+ g_iconv_close (bucket->cd);
e_memchunk_free (cache_chunk, bucket);
iconv_cache_size--;
@@ -461,7 +461,7 @@ camel_iconv_open (const char *to, const char *from)
size_t
camel_iconv (iconv_t cd, const char **inbuf, size_t *inleft, char **outbuf, size_t *outleft)
{
- return iconv (cd, inbuf, inleft, outbuf, outleft);
+ return g_iconv (cd, (char **) inbuf, inleft, outbuf, outleft);
}