pidgin.2.4.3: 229ae6c4: applied changes from a5e7a62db1d43009f4f...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 229ae6c4604aa255606b14479028b535359ac0cf
Ancestor: 952723bfc44fd12a772b7498bbb07c2bd603a3d8
Author: datallah at pidgin.im
Date: 2008-06-19T03:14:03
Branch: im.pidgin.pidgin.2.4.3
URL: http://d.pidgin.im/viewmtn/revision/info/229ae6c4604aa255606b14479028b535359ac0cf

Modified files:
        ChangeLog libpurple/protocols/yahoo/util.c

ChangeLog: 

applied changes from a5e7a62db1d43009f4ff463b7fe67ff3a7275a78
             through 2e34cc5b5c98162e2a36c51a9eff26fcaa55dcf2

applied changes from 2e34cc5b5c98162e2a36c51a9eff26fcaa55dcf2
             through f27cf27abac3307baeb823ac405c3c09bf5f057e

-------------- next part --------------
============================================================
--- ChangeLog	cf402416ce951d716665425e9e90db6ca37cfe36
+++ ChangeLog	b0a6aae85ccf8a827f5e035212e6be7a5cbd9c3d
@@ -1,6 +1,9 @@ version 2.4.3 (??/??/2008):
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.4.3 (??/??/2008):
+	libpurple:
+	* Yahoo! Japan now uses UTF-8, matching the behavior of official clients
+	  and restoring compatibility with the web messenger (Yusuke Odate)
 
 version 2.x.x:
 	libpurple:
============================================================
--- libpurple/protocols/yahoo/util.c	6a72fcc2054413ee7791e5c5cc62b6b18f4bcce0
+++ libpurple/protocols/yahoo/util.c	2a3725bcc455684e1c1bb42bd4982cc322732f38
@@ -114,18 +114,15 @@ char *yahoo_string_encode(PurpleConnecti
 	char *ret;
 	const char *to_codeset;
 
-	if (yd->jp && utf8 && *utf8)
-		*utf8 = FALSE;
+	if (yd->jp)
+		return g_strdup(str);
 
 	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
-		to_codeset = purple_account_get_string(purple_connection_get_account(gc), "local_charset",  "ISO-8859-1");
+	to_codeset = purple_account_get_string(purple_connection_get_account(gc), "local_charset",  "ISO-8859-1");
+	ret = g_convert_with_fallback(str, -1, to_codeset, "UTF-8", "?", NULL, NULL, NULL);
 
-	ret = g_convert_with_fallback(str, -1, to_codeset, "UTF-8", "?", NULL, NULL, NULL);
 	if (ret)
 		return ret;
 	else