changeset 9371:30598cb2efb5

[gaim-migrate @ 10179] Yahoo Japan works again. We were sending it the wrong proto ver before. committer: Tailor Script <tailor@pidgin.im>
author Tim Ringenbach <marv@pidgin.im>
date Thu, 24 Jun 2004 04:02:44 +0000
parents 76f4bffcfb23
children e54181e5c906
files src/protocols/yahoo/yahoo.c src/protocols/yahoo/yahoo.h
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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);
--- 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)