pidgin: a7adefea: The PartnerScenario in the ABContactUpda...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: a7adefeac6a854f260f68566d4e46488e99d0d6b
Parent:   83282f3b5796a1c4854355c8d7faad2b2c632526
Author:   qulogic at pidgin.im
Date:     12/02/10 00:03:05
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a7adefeac6a854f260f68566d4e46488e99d0d6b

Changelog: 

The PartnerScenario in the ABContactUpdate SOAP request should
probably not be Timer all the time.

Changes against parent 83282f3b5796a1c4854355c8d7faad2b2c632526

  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/contact.h

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/contact.c	c12819fb6b5ed97eccbbf3bfffe1226ab5cc0083
+++ libpurple/protocols/msn/contact.c	e09e7c6e5d31ffd2c8434c1347140e7562351ff9
@@ -41,7 +41,8 @@ const char *MsnSoapPartnerScenarioText[]
 	"ContactSave",
 	"MessengerPendingList",
 	"ContactMsgrAPI",
-	"BlockUnblock"
+	"BlockUnblock",
+	"Timer"
 };
 
 const char *MsnMemberRole[] =
@@ -1497,6 +1498,10 @@ msn_update_contact(MsnSession *session, 
 	xmlnode_insert_child(contact, contact_info);
 	xmlnode_insert_child(contact, changes);
 
+	xmlnode_insert_data(xmlnode_get_child(state->body,
+	                                      "Header/ABApplicationHeader/PartnerScenario"),
+	                    MsnSoapPartnerScenarioText[MSN_PS_SAVE_CONTACT], -1);
+
 	if (user) {
 		xmlnode *contactId = xmlnode_new_child(contact, "contactId");
 		msn_callback_state_set_uid(state, user->uid);
============================================================
--- libpurple/protocols/msn/contact.h	1ba18333d89f00e3aea1f44e4b404d3a3bcab2f4
+++ libpurple/protocols/msn/contact.h	a06078e54845950d25f44baf9c82eaa768b6496d
@@ -52,7 +52,8 @@ typedef enum
 	MSN_PS_SAVE_CONTACT,
 	MSN_PS_PENDING_LIST,
 	MSN_PS_CONTACT_API,
-	MSN_PS_BLOCK_UNBLOCK
+	MSN_PS_BLOCK_UNBLOCK,
+	MSN_PS_TIMER
 } MsnSoapPartnerScenario;
 
 #include "session.h"
@@ -408,7 +409,7 @@ typedef enum
 		"<ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
 			"<ApplicationId>" MSN_APPLICATION_ID "</ApplicationId>"\
 			"<IsMigration>false</IsMigration>"\
-			"<PartnerScenario>Timer</PartnerScenario>"\
+			"<PartnerScenario></PartnerScenario>"\
 		"</ABApplicationHeader>"\
 		"<ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\">"\
 			"<ManagedGroupRequest>false</ManagedGroupRequest>"\