# HG changeset patch
# User Tim Ringenbach <marv@pidgin.im>
# Date 1088049764 0
# Node ID 30598cb2efb5508d729dcb1e618df3a196a93f14
# Parent  76f4bffcfb2330c8a975f5037c5414b330c8b6ae
[gaim-migrate @ 10179]
Yahoo Japan works again. We were sending it the wrong proto ver before.

committer: Tailor Script <tailor@pidgin.im>

diff -r 76f4bffcfb23 -r 30598cb2efb5 src/protocols/yahoo/yahoo.c
--- a/src/protocols/yahoo/yahoo.c	Thu Jun 24 03:55:54 2004 +0000
+++ b/src/protocols/yahoo/yahoo.c	Thu Jun 24 04:02:44 2004 +0000
@@ -245,7 +245,12 @@
 	data = g_malloc0(len + 1);
 
 	memcpy(data + pos, "YMSG", 4); pos += 4;
-	pos += yahoo_put16(data + pos, YAHOO_PROTO_VER);
+
+	if (yd->wm)
+		pos += yahoo_put16(data + pos, YAHOO_WEBMESSENGER_PROTO_VER);
+	else
+		pos += yahoo_put16(data + pos, YAHOO_PROTO_VER);
+
 	pos += yahoo_put16(data + pos, 0x0000);
 	pos += yahoo_put16(data + pos, pktlen);
 	pos += yahoo_put16(data + pos, pkt->service);
@@ -278,7 +283,9 @@
 	data = g_malloc0(len + 1);
 
 	memcpy(data + pos, "YMSG", 4); pos += 4;
+
 	pos += yahoo_put16(data + pos, YAHOO_PROTO_VER);
+
 	pos += yahoo_put16(data + pos, 0x0000);
 	pos += yahoo_put16(data + pos, pktlen + pad);
 	pos += yahoo_put16(data + pos, pkt->service);
diff -r 76f4bffcfb23 -r 30598cb2efb5 src/protocols/yahoo/yahoo.h
--- a/src/protocols/yahoo/yahoo.h	Thu Jun 24 03:55:54 2004 +0000
+++ b/src/protocols/yahoo/yahoo.h	Thu Jun 24 04:02:44 2004 +0000
@@ -193,11 +193,10 @@
 
 #define YAHOO_MAX_STATUS_MESSAGE_LENGTH (48)
 
-#ifdef YAHOO_WEBMESSENGER
-#define YAHOO_PROTO_VER 0x0065
-#else
+
+#define YAHOO_WEBMESSENGER_PROTO_VER 0x0065
 #define YAHOO_PROTO_VER 0x000b
-#endif
+
 
 #define YAHOO_PACKET_HDRLEN (4 + 2 + 2 + 2 + 2 + 4 + 4)