# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1270046261 -32400
# Node ID 1e59677a2035872aeeb5a5d4617ef697ceca7da7
# Parent  70b0f46f2966ee447890791b83f887cf68a48109
adapted to new yahoo jp configurations

diff -r 70b0f46f2966 -r 1e59677a2035 libpurple/protocols/yahoo/libyahoojp.c
--- a/libpurple/protocols/yahoo/libyahoojp.c	Tue Mar 30 15:27:03 2010 +0900
+++ b/libpurple/protocols/yahoo/libyahoojp.c	Wed Mar 31 23:37:41 2010 +0900
@@ -207,7 +207,7 @@
 	option = purple_account_option_string_new(_("Pager server"), "server", YAHOOJP_PAGER_HOST);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_int_new(_("Pager port"), "port", YAHOO_PAGER_PORT);
+	option = purple_account_option_int_new(_("Pager port"), "port", YAHOOJP_PAGER_PORT);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	option = purple_account_option_string_new(_("File transfer server"), "xfer_host", YAHOOJP_XFER_HOST);
diff -r 70b0f46f2966 -r 1e59677a2035 libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c	Tue Mar 30 15:27:03 2010 +0900
+++ b/libpurple/protocols/yahoo/libymsg.c	Wed Mar 31 23:37:41 2010 +0900
@@ -3561,7 +3561,8 @@
 
 	server = purple_account_get_string(account, "server",
 					yd->jp ? YAHOOJP_PAGER_HOST : YAHOO_PAGER_HOST);
-	pager_port = purple_account_get_int(account, "port", YAHOO_PAGER_PORT);
+	pager_port = purple_account_get_int(account, "port",
+					yd->jp ? YAHOOJP_PAGER_PORT : YAHOO_PAGER_PORT);
 
 	if (purple_proxy_connect(gc, account, server, pager_port, yahoo_got_connected, gc) == NULL)
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
diff -r 70b0f46f2966 -r 1e59677a2035 libpurple/protocols/yahoo/libymsg.h
--- a/libpurple/protocols/yahoo/libymsg.h	Tue Mar 30 15:27:03 2010 +0900
+++ b/libpurple/protocols/yahoo/libymsg.h	Wed Mar 31 23:37:41 2010 +0900
@@ -46,7 +46,8 @@
 #define YAHOO_ROOMLIST_LOCALE "us"
 /* really we should get the list of servers from
  http://update.messenger.yahoo.co.jp/servers.html */
-#define YAHOOJP_PAGER_HOST "cs.yahoo.co.jp"
+#define YAHOOJP_PAGER_HOST "cs1.msg.vip.ogk.yahoo.co.jp"
+#define YAHOOJP_PAGER_PORT 80
 #define YAHOOJP_TOKEN_URL "https://login.yahoo.co.jp/config/pwtoken_get?src=ymsgr&ts=&login=%s&passwd=%s&chal=%s"
 #define YAHOOJP_LOGIN_URL "https://login.yahoo.co.jp/config/pwtoken_login?src=ymsgr&ts=&token=%s"
 #define YAHOOJP_PROFILE_URL "http://profiles.yahoo.co.jp/"