Mercurial > pidgin3 / file diff

--- a/src/protocols/oscar/oscar.c	Wed Jul 07 16:32:05 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Wed Jul 07 17:56:59 2004 +0000
@@ -399,7 +399,10 @@
 
 	switch (flags) {
 	case 0:
-		utf8 = g_convert(text, textlen, "UTF-8", "UTF-8", NULL, NULL, NULL);
+		if (!g_utf8_validate(text, textlen, NULL))
+			utf8 = g_strdup(_("(There was an error converting this message.  The buddy you are speaking to most likely has a buggy client.)"));
+		else
+			utf8 = g_strdup(text);
 		break;
 	case AIM_IMFLAGS_ISO_8859_1:
 		utf8 = g_convert(text, textlen, "UTF-8", "ISO-8859-1", NULL, NULL, NULL);