pidgin: 35556576: It appears that Yahoo! Japan has disable...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 35556576c8b9b3c77f9674eb5de05f1a325e2851
Ancestor: 4198c206c4bbfd889e39d1dd6c7fb19d1630a3f7
Author: rekkanoryo at pidgin.im
Date: 2008-04-19T14:18:06
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/35556576c8b9b3c77f9674eb5de05f1a325e2851

Modified files:
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_packet.h

ChangeLog: 

It appears that Yahoo! Japan has disabled protocol 0x0c and now require 0x0f.
This enables logging into Yahoo! Japan again.  Fixes #5557.

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/yahoo.h	e96fe22cf0f67333a831aa300a1e0312ff4c457e
+++ libpurple/protocols/yahoo/yahoo.h	88f1c90f2d0c08025299f1fea562ff61d747e229
@@ -76,14 +76,9 @@
 
 #define YAHOO_CLIENT_VERSION_ID "2097087"
 #define YAHOO_CLIENT_VERSION "8.1.0.421"
-#define YAHOOJP_CLIENT_VERSION "6,0,0,1710"
 
-#if 0
-/* The following were observed with the Yahoo Japan client current as of January
- * 2008, but appear not to work correctly for file transfer.  Here as reference */
-# define YAHOOJP_CLIENT_VERSION_ID "524223"
-# define YAHOOJP_CLIENT_VERSION "7,0,1,1"
-#endif
+#define YAHOOJP_CLIENT_VERSION_ID "524223"
+#define YAHOOJP_CLIENT_VERSION "7,0,1,1"
 
 
 /* Index into attention types list. */
============================================================
--- libpurple/protocols/yahoo/yahoo_packet.h	9512960fb94bf8d4adb05cdf2ae5530c93a42d97
+++ libpurple/protocols/yahoo/yahoo_packet.h	16e39edd7381ec46fdf4df3c5cb222835968314c
@@ -123,7 +123,7 @@ struct yahoo_packet {
 
 #define YAHOO_WEBMESSENGER_PROTO_VER 0x0065
 #define YAHOO_PROTO_VER 0x000f
-#define YAHOO_PROTO_VER_JAPAN 0x000c
+#define YAHOO_PROTO_VER_JAPAN 0x000f
 
 #define YAHOO_PACKET_HDRLEN (4 + 2 + 2 + 2 + 2 + 4 + 4)