From dfd09f4f17bc75a3d8d745e850f00bbee919d820 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Fri, 19 Oct 2001 01:56:21 +0000 Subject: Don't use a g_return_val_if_fail after iconv_open, this is a valid error 2001-10-18 Jeffrey Stedfast * e-msg-composer.c (best_encoding): Don't use a g_return_val_if_fail after iconv_open, this is a valid error condition and so should use check it for real. * e-msg-composer-attachment-bar.c (attach_to_multipart): Correctly set the charset parameter and use camel's bestenc filter to determine which content transfer encoding to use. svn path=/trunk/; revision=13784 --- composer/e-msg-composer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'composer/e-msg-composer.c') diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 8e611843eb..3227a2e1a7 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -167,7 +167,8 @@ best_encoding (GByteArray *buf, const char *charset) return -1; cd = iconv_open (charset, "utf-8"); - g_return_val_if_fail (cd != (iconv_t)-1, -1); + if (cd == (iconv_t) -1) + return -1; in = buf->data; inlen = buf->len; -- cgit