diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-10-19 09:56:21 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-10-19 09:56:21 +0800 |
| commit | dfd09f4f17bc75a3d8d745e850f00bbee919d820 (patch) | |
| tree | 85c1e4cd025abca81d10ec0acd943c9b76fe76a4 /composer/e-msg-composer.c | |
| parent | df5691bccf164913fe9b92aa03facbdfff1b9fa4 (diff) | |
| download | gsoc2013-evolution-dfd09f4f17bc75a3d8d745e850f00bbee919d820.tar gsoc2013-evolution-dfd09f4f17bc75a3d8d745e850f00bbee919d820.tar.gz gsoc2013-evolution-dfd09f4f17bc75a3d8d745e850f00bbee919d820.tar.bz2 gsoc2013-evolution-dfd09f4f17bc75a3d8d745e850f00bbee919d820.tar.lz gsoc2013-evolution-dfd09f4f17bc75a3d8d745e850f00bbee919d820.tar.xz gsoc2013-evolution-dfd09f4f17bc75a3d8d745e850f00bbee919d820.tar.zst gsoc2013-evolution-dfd09f4f17bc75a3d8d745e850f00bbee919d820.zip | |
Don't use a g_return_val_if_fail after iconv_open, this is a valid error
2001-10-18 Jeffrey Stedfast <fejj@ximian.com>
* 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
Diffstat (limited to 'composer/e-msg-composer.c')
| -rw-r--r-- | composer/e-msg-composer.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |