pidgin: 83282f3b: Apparently, UBM was updated with more pa...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 83282f3b5796a1c4854355c8d7faad2b2c632526
Parent:   b88ec4006ba51d5efaec3cb80243ab30d82e380f
Author:   qulogic at pidgin.im
Date:     12/01/10 22:59:58
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/83282f3b5796a1c4854355c8d7faad2b2c632526

Changelog: 

Apparently, UBM was updated with more parameters in MSNp16. One is 
your own email address, but I'm not sure what the 4th parameter is. 
 
Anyway, update payload length to use the correct parameter now. 
 
Fixes #13022.

Changes against parent b88ec4006ba51d5efaec3cb80243ab30d82e380f

  patched  ChangeLog
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/switchboard.c

-------------- next part --------------
============================================================
--- ChangeLog	d2fe0b98c51127e89679801bc94822591bce8bef
+++ ChangeLog	2dac3780b4e5209cd93e69164fffba5036260f23
@@ -28,6 +28,8 @@ version 2.7.8 (??/??/????):
 	  disconnected.
 	* Allow full-size display names, by not escaping (most) non-English
 	  characters. (#8508)
+	* Fix receiving messages from users on Yahoo and other federated
+	  services. (#13022)
 
 version 2.7.7 (11/23/2010):
 	General:
============================================================
--- libpurple/protocols/msn/switchboard.c	0c793bb433871df2f0988e0d6dfd7762a59dc4b4
+++ libpurple/protocols/msn/switchboard.c	274e0af6b40167b8b34ff6eaa2a6cc50e20cc6cb
@@ -743,7 +743,10 @@ ubm_cmd(MsnCmdProc *cmdproc, MsnCommand 
 ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
 	purple_debug_misc("msn", "get UBM...\n");
-	cmd->payload_len = atoi(cmd->params[3]);
+	if (cmdproc->session->protocol_ver >= 16)
+		cmd->payload_len = atoi(cmd->params[5]);
+	else
+		cmd->payload_len = atoi(cmd->params[3]);
 	cmdproc->last_cmd->payload_cb = msg_cmd_post;
 }
 
============================================================
--- libpurple/protocols/msn/notification.c	99fbe2dcbd72111badcce772ef6775b3d8c6b453
+++ libpurple/protocols/msn/notification.c	4e8e91c92020854698658a490ccb2916eeaf64df
@@ -387,7 +387,10 @@ ubm_cmd(MsnCmdProc *cmdproc, MsnCommand 
 	 * command and we are processing it */
 	if (cmd->payload == NULL) {
 		cmdproc->last_cmd->payload_cb = msg_cmd_post;
-		cmd->payload_len = atoi(cmd->params[3]);
+		if (cmdproc->session->protocol_ver >= 16)
+			cmd->payload_len = atoi(cmd->params[5]);
+		else
+			cmd->payload_len = atoi(cmd->params[3]);
 	} else {
 		g_return_if_fail(cmd->payload_cb != NULL);