callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changes to the iconv code so that it does the check in the return

Browse Source 
2001-08-03  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-pgp-context.c (pgp_verify): Minor changes to the iconv
	code so that it does the check in the return value of iconv() just
	like the code in camel-mime-utils.c in case this fixes Bo Rosen's
	gpg bugs (but I doubt this will change anything?).

svn path=/trunk/; revision=11622
This commit is contained in:
Jeffrey Stedfast
2001-08-03 20:36:24 +00:00
committed by Jeffrey Stedfast
parent 9fd0fc50be
commit c6daf26ade
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
camel/ChangeLog
View File

@ -1,3 +1,10 @@
2001-08-03 Jeffrey Stedfast <fejj@ximian.com>
* camel-pgp-context.c (pgp_verify): Minor changes to the iconv
code so that it does the check in the return value of iconv() just
like the code in camel-mime-utils.c in case this fixes Bo Rosen's
gpg bugs (but I doubt this will change anything?).
2001-08-03 Jeffrey Stedfast <fejj@ximian.com>
* providers/smtp/camel-smtp-transport.c (smtp_connect): First

8
camel/camel-pgp-context.c
View File

@ -998,15 +998,21 @@ pgp_verify (CamelCipherContext *ctx, CamelCipherHash hash, CamelStream *istream,
cd = iconv_open ("UTF-8", locale);
if (cd != (iconv_t) -1) {
const char *inbuf;
int ret;
inbuf = diagnostics;
iconv (cd, &inbuf, &inlen, &outbuf, &outlen);
ret = iconv (cd, &inbuf, &inlen, &outbuf, &outlen);
if (ret >= 0) {
iconv (cd, NULL, 0, &outbuf, &outlen);
}
iconv_close (cd);
*outbuf = '\0';
} else {
const char *inptr, *inend;
g_warning ("CamelPgpContext::pgp_verify: cannot convert from %s to UTF-8", locale);
inptr = diagnostics;
inend = inptr + inlen;