# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1208614686 0
# Node ID 269bba623a6265054aa4d044563a1c86e96ecece
# Parent  ff16ce9722530f10cd9942168f5fef21c73c9afa
It appears that Yahoo! Japan has disabled protocol 0x0c and now require 0x0f.
This enables logging into Yahoo! Japan again.  Fixes #5557.

diff -r ff16ce972253 -r 269bba623a62 libpurple/protocols/yahoo/yahoo.h
--- a/libpurple/protocols/yahoo/yahoo.h	Sat Apr 19 04:59:27 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo.h	Sat Apr 19 14:18:06 2008 +0000
@@ -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. */
diff -r ff16ce972253 -r 269bba623a62 libpurple/protocols/yahoo/yahoo_packet.h
--- a/libpurple/protocols/yahoo/yahoo_packet.h	Sat Apr 19 04:59:27 2008 +0000
+++ b/libpurple/protocols/yahoo/yahoo_packet.h	Sat Apr 19 14:18:06 2008 +0000
@@ -123,7 +123,7 @@
 
 #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)