# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1246804297 0
# Node ID 7f008ce8604b7064b0b1c3610faa0fcb9ab6f483
# Parent  1f30c4a47e3dc19d58b36b91b5e1dc89dfd2e79a
I believe this will correctly handle setting the yd->jp value under the new
two-prpl model.  I still need to put a migration path in for existing Yahoo!
JAPAN accounts.

diff -r 1f30c4a47e3d -r 7f008ce8604b libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c	Sun Jul 05 14:14:14 2009 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Sun Jul 05 14:31:37 2009 +0000
@@ -3428,10 +3428,10 @@
 	yahoo_server_check(account);
 	yahoo_picture_check(account);
 
-	if (purple_account_get_bool(account, "yahoojp", FALSE)) {
+	if (purple_strequal(purple_account_get_protocol_id(account), "yahoojp")) {
 		yd->jp = TRUE;
 		if (purple_proxy_connect(gc, account,
-		                       purple_account_get_string(account, "serverjp",  YAHOOJP_PAGER_HOST),
+		                       purple_account_get_string(account, "server",  YAHOOJP_PAGER_HOST),
 		                       purple_account_get_int(account, "port", YAHOO_PAGER_PORT),
 		                       yahoo_got_connected, gc) == NULL)
 		{