[Gaim-commits] CVS: gaim/src/protocols/irc parse.c,1.37,1.38

[Richard L. <rl...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/irc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2769/src/protocols/irc

Modified Files:
	parse.c 
Log Message:
g_utf8_validate() and g_convert() accept -1 as a length argument, so there's no need to call strlen() ourselves.

Index: parse.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/irc/parse.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -p -r1.37 -r1.38
--- parse.c	20 Aug 2005 20:17:07 -0000	1.37
+++ parse.c	22 Oct 2005 22:58:16 -0000	1.38
@@ -251,10 +251,10 @@ static char *irc_recv_convert(struct irc
 			charset++;
 
 		if (!strcasecmp("UTF-8", charset)) {
-			if (g_utf8_validate(string, strlen(string), NULL))
+			if (g_utf8_validate(string, -1, NULL))
 				utf8 = g_strdup(string);
 		} else {
-			utf8 = g_convert(string, strlen(string), "UTF-8", charset, NULL, NULL, NULL);
+			utf8 = g_convert(string, -1, "UTF-8", charset, NULL, NULL, NULL);
 		}
 
 		if (utf8) {