From: Sean E. <sea...@us...> - 2003-08-12 05:05:02
|
Update of /cvsroot/gaim/gaim/src In directory sc8-pr-cvs1:/tmp/cvs-serv30805/src Modified Files: util.c Log Message: "Even if the conversion was successful, this may be less than len if there were partial characters at the end of the input." Index: util.c =================================================================== RCS file: /cvsroot/gaim/gaim/src/util.c,v retrieving revision 1.207 retrieving revision 1.208 diff -u -d -r1.207 -r1.208 --- util.c 6 Aug 2003 19:36:53 -0000 1.207 +++ util.c 12 Aug 2003 05:02:56 -0000 1.208 @@ -869,12 +869,11 @@ } utf8 = g_locale_to_utf8(str, -1, &converted, NULL, NULL); - if (utf8 && converted == strlen (str)) { + if (utf8) return(utf8); - } else if (utf8) { - g_free(utf8); - } - + + g_free(utf8); + utf8 = g_convert(str, -1, "UTF-8", "ISO-8859-15", &converted, NULL, NULL); if (utf8 && converted == strlen (str)) { return(utf8); |