# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1204273954 0
# Node ID 839cc551cad908c58b2604a6224aabef99be7f24
# Parent  085d0a18a7f774719e88fbb3e2214f45e8fad1ae
no reason to exclude yd->jp

diff -r 085d0a18a7f7 -r 839cc551cad9 libpurple/protocols/yahoo/util.c
--- a/libpurple/protocols/yahoo/util.c	Thu Feb 28 12:28:35 2008 +0000
+++ b/libpurple/protocols/yahoo/util.c	Fri Feb 29 08:32:34 2008 +0000
@@ -116,13 +116,10 @@
 	size_t newlen;
 	const char *to_codeset;
 
-	if (yd->jp && utf8 && *utf8) {
+	if (utf8 && *utf8) {
 		return botch_utf((gchar *)str, strlen((gchar *)str), &newlen);
 	}
 
-	if (utf8 && *utf8) /* FIXME: maybe don't use utf8 if it'll fit in latin1 */
-		return g_strdup(str);
-
 	if (yd->jp)
 		to_codeset = "SHIFT_JIS";
 	else