Mercurial > pidgin

changeset 20487:9812222e89d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up some unused SOAP templates, and disable extra debug defines accidentally checked in.
author Carlos Silva <typ0@pidgin.im>
date Mon, 03 Sep 2007 06:07:20 +0000
parents ff4ae9dde291
children 64c322c3b1b0
files libpurple/protocols/msn/contact.h libpurple/protocols/msn/msn.h libpurple/protocols/msn/soap.h
diffstat 3 files changed, 4 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/contact.h	Mon Sep 03 05:47:52 2007 +0000
+++ b/libpurple/protocols/msn/contact.h	Mon Sep 03 06:07:20 2007 +0000
@@ -213,7 +213,6 @@
 #define MSN_CONTACT_DEL_GROUP_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABGroupContactDelete"
 #define MSN_CONTACT_DEL_GROUP_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>Timer</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><ABGroupContactDelete xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><contacts>%s</contacts><groupFilter><groupIds><guid>%s</guid></groupIds></groupFilter></ABGroupContactDelete></soap:Body></soap:Envelope>"
 
-#define MSN_MEMBER_TEMPLATE	"<Member xsi:type=\"PassportMember\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"><Type>Passport</Type><State>Accepted</State><PassportName>%s</PassportName></Member>"
 
 /* Update Contact Nickname */
 #define MSN_CONTACT_UPDATE_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/ABContactUpdate"
@@ -247,14 +246,14 @@
 
 
 /*******************************************************
- * Contact Block/Unblock SOAP actions
+ * Add/Delete contact from lists SOAP actions
  *******************************************************/
 
 /* block means delete from allow list and add contact to block list */
 #define MSN_SHARE_POST_URL		"/abservice/SharingService.asmx"
 
-#define MSN_CONTACT_BLOCK_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/AddMember"
 #define MSN_ADD_MEMBER_TO_LIST_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/AddMember"
+#define MSN_DELETE_MEMBER_FROM_LIST_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/DeleteMember"
 
 #define MSN_MEMBER_PASSPORT_XML	"<Member xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"PassportMember\">"\
 					"<Type>Passport</Type>"\
@@ -332,11 +331,6 @@
 	"</soap:Body>"\
 "</soap:Envelope>"
 
-/* unblock means delete contact from block list */
-#define MSN_CONTACT_UNBLOCK_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/DeleteMember"
-#define MSN_DELETE_MEMBER_FROM_LIST_SOAP_ACTION	"http://www.msn.com/webservices/AddressBook/DeleteMember"
-
-#define MSN_UNBLOCK_CONTACT_TEMPLATE	"<?xml version=\"1.0\" encoding=\"utf-8\"?><soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soapenc=\"http://schemas.xmlsoap.org/soap/encoding/\"><soap:Header><ABApplicationHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ApplicationId>09607671-1C32-421F-A6A6-CBFAA51AB5F4</ApplicationId><IsMigration>false</IsMigration><PartnerScenario>BlockUnblock</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><DeleteMember xmlns=\"http://www.msn.com/webservices/AddressBook\"><serviceHandle><Id>0</Id><Type>Messenger</Type><ForeignId></ForeignId></serviceHandle><memberships><Membership><MemberRole>Block</MemberRole><Members>%s</Members></Membership></memberships></DeleteMember></soap:Body></soap:Envelope>"
 
 
 /*******************************************************
--- a/libpurple/protocols/msn/msn.h	Mon Sep 03 05:47:52 2007 +0000
+++ b/libpurple/protocols/msn/msn.h	Mon Sep 03 06:07:20 2007 +0000
@@ -32,7 +32,7 @@
 /* #define MSN_DEBUG_SLP_VERBOSE 1 */
 /* #define MSN_DEBUG_SLP_FILES 1 */
 
-#define MSN_DEBUG_NS 1
+/* #define MSN_DEBUG_NS 1 */
 /* #define MSN_DEBUG_SB 1 */
 
 #include "internal.h"
--- a/libpurple/protocols/msn/soap.h	Mon Sep 03 05:47:52 2007 +0000
+++ b/libpurple/protocols/msn/soap.h	Mon Sep 03 06:07:20 2007 +0000
@@ -29,7 +29,7 @@
 #define MSN_SOAP_READ_BUFF_SIZE		8192
 
 /* define this to debug the communications with the SOAP server */
-#define MSN_SOAP_DEBUG 
+/* #define MSN_SOAP_DEBUG  */
 
 
 typedef enum