cpw.qulogic.msn: b60fbaa6: Clean up some MSN SOAP stuff.
qulogic at pidgin.im
qulogic at pidgin.im
Sat Jun 28 04:20:48 EDT 2008
-----------------------------------------------------------------
Revision: b60fbaa6b87d1331c55a494a752f94a23869130f
Ancestor: 5686ca0d901868eea6b17e97658c83aec570c66d
Author: qulogic at pidgin.im
Date: 2008-06-28T06:01:22
Branch: im.pidgin.cpw.qulogic.msn
URL: http://d.pidgin.im/viewmtn/revision/info/b60fbaa6b87d1331c55a494a752f94a23869130f
Deleted entries:
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/soap.h
Renamed entries:
libpurple/protocols/msn/soap2.c to libpurple/protocols/msn/soap.c
libpurple/protocols/msn/soap2.h to libpurple/protocols/msn/soap.h
Modified files:
libpurple/protocols/msn/Makefile.am
libpurple/protocols/msn/contact.c
libpurple/protocols/msn/contact.h
libpurple/protocols/msn/group.h
libpurple/protocols/msn/nexus.c
libpurple/protocols/msn/nexus.h
libpurple/protocols/msn/oim.c libpurple/protocols/msn/oim.h
libpurple/protocols/msn/soap.c
libpurple/protocols/msn/soap.h
ChangeLog:
Clean up some MSN SOAP stuff.
I think soap2.[ch] have proven themselves since we've been using them
all this time. Removed soap.[ch] and any references to them, since
those were mostly in header files, without any actual use in code.
Also, removed some SOAP templates from group.h which are now taken
care of by contact.[ch].
-------------- next part --------------
============================================================
--- libpurple/protocols/msn/Makefile.am 31cc941e8fb634473535fb88c75e41981dcceda5
+++ libpurple/protocols/msn/Makefile.am 4937b068d2cf230ddd477659c7d21294fd989458
@@ -50,10 +50,8 @@ MSNSOURCES = \
slpmsg.h \
slpsession.c \
slpsession.h \
- soap.c\
- soap.h\
- soap2.c \
- soap2.h \
+ soap.c \
+ soap.h \
state.c \
state.h \
switchboard.c \
============================================================
--- libpurple/protocols/msn/contact.c 6dcc210c613b957689a0c6463284759ba85406dd
+++ libpurple/protocols/msn/contact.c b13174a983fe12ca067f85e0d7516540bd53f660
@@ -28,7 +28,7 @@
#include "contact.h"
#include "xmlnode.h"
#include "group.h"
-#include "soap2.h"
+#include "soap.h"
#include "nexus.h"
const char *MsnSoapPartnerScenarioText[] =
@@ -78,7 +78,7 @@ msn_callback_state_dup(MsnCallbackState
/* The rest should be made new */
return new_state;
-}
+}
void
msn_callback_state_free(MsnCallbackState *state)
============================================================
--- libpurple/protocols/msn/contact.h 9561c43700f057f7b5ff5745bd99c1ca864c6b9a
+++ libpurple/protocols/msn/contact.h 6b83f03495612d63d7a31c940e73bbdb79427154
@@ -670,7 +670,5 @@ void msn_del_contact_from_list(MsnSessio
void msn_del_contact_from_list(MsnSession *session, MsnCallbackState *state,
const gchar *passport, const MsnListId list);
-void msn_contact_connect_init(MsnSoapConn *soapconn);
-
#endif /* _MSN_CONTACT_H_ */
============================================================
--- libpurple/protocols/msn/group.h e75f3e647415240751778baff8e441eb63e53440
+++ libpurple/protocols/msn/group.h dc19e0caf7b65e17d4fc2ee76f4ea1eb5946a07e
@@ -30,16 +30,8 @@ typedef struct _MsnGroup MsnGroup;
#include "session.h"
#include "user.h"
-#include "soap.h"
#include "userlist.h"
-#define MSN_ADD_GROUPS "<GroupInfo><name>test111</name><groupType>C8529CE2-6EAD-434d-881F-341E17DB3FF8</groupType><fMessenger>false</fMessenger><annotations><Annotation><Name>MSN.IM.Display</Name><Value>1</Value></Annotation></annotations></GroupInfo>"
-
-#define MSN_ADD_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>GroupSave</PartnerScenario></ABApplicationHeader><ABAuthHeader xmlns=\"http://www.msn.com/webservices/AddressBook\"><ManagedGroupRequest>false</ManagedGroupRequest></ABAuthHeader></soap:Header><soap:Body><ABGroupAdd xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><groupAddOptions><fRenameOnMsgrConflict>false</fRenameOnMsgrConflict></groupAddOptions><groupInfo>%s</groupInfo></ABGroupAdd></soap:Body></soap:Envelope>"
-
-#define MSN_GROUP_IDS "<guid>9e57e654-59f0-44d1-aedc-0a7500b7e51f</guid>"
-#define MSN_DELETE_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><ABGroupDelete xmlns=\"http://www.msn.com/webservices/AddressBook\"><abId>00000000-0000-0000-0000-000000000000</abId><groupFilter><groupIds>%s</groupIds></groupFilter></ABGroupDelete></soap:Body></soap:Envelope>"
-
#define MSN_INDIVIDUALS_GROUP_ID "1983"
#define MSN_INDIVIDUALS_GROUP_NAME "Other Contacts"
@@ -52,7 +44,6 @@ struct _MsnGroup
struct _MsnGroup
{
MsnSession *session; /**< The MSN session. */
- MsnSoapConn *soapconn;
char *id; /**< The group ID. */
char *name; /**< The name of the group. */
============================================================
--- libpurple/protocols/msn/nexus.c e508d7256a8d1bcafcff23fbf0b68fd2a9f0f349
+++ libpurple/protocols/msn/nexus.c 2413bbd25a4aeec566f490942fb63d2d5ed808ca
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "msn.h"
-#include "soap2.h"
+#include "soap.h"
#include "nexus.h"
#include "notification.h"
============================================================
--- libpurple/protocols/msn/nexus.h c015938cf1c2a2103d878f909c550e0b6661c397
+++ libpurple/protocols/msn/nexus.h a13a1124cea055eb92e4cdff8154852c33321c3a
@@ -24,8 +24,6 @@
#ifndef _MSN_NEXUS_H_
#define _MSN_NEXUS_H_
-#include "soap.h"
-
/* Index into ticket_tokens in nexus.c Keep updated! */
typedef enum
{
============================================================
--- libpurple/protocols/msn/oim.c dbe54d6bbd7d3b999fef673b52fe073dfddd3443
+++ libpurple/protocols/msn/oim.c 804cfe2ec71c7c829c01047753e0abe727c837e1
@@ -24,7 +24,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "msn.h"
-#include "soap2.h"
+#include "soap.h"
#include "oim.h"
#include "msnutils.h"
============================================================
--- libpurple/protocols/msn/oim.h fa583cd8ba2c9614d9f724ceea554dea85906680
+++ libpurple/protocols/msn/oim.h 77c86fda3824a53aef264fbab574a7e906b462db
@@ -138,10 +138,8 @@ struct _MsnOim
{
MsnSession *session;
- MsnSoapConn *retrieveconn;
GList * oim_list;
- MsnSoapConn *sendconn;
char *challenge;
char *run_id;
gint send_seq;
============================================================
--- libpurple/protocols/msn/soap2.c 1528bf5b9da18f283433a41431c6a2f5375b267c
+++ libpurple/protocols/msn/soap.c 14343d1edb922f5132d958ebcd6d2c7d0599772d
@@ -1,5 +1,5 @@
/**
- * @file soap2.c
+ * @file soap.c
* C file for SOAP connection related process
*
* purple
@@ -25,7 +25,7 @@
#include "internal.h"
-#include "soap2.h"
+#include "soap.h"
#include "session.h"
@@ -515,7 +515,7 @@ msn_soap_connection_run(gpointer data)
PURPLE_INPUT_WRITE, msn_soap_write_cb, conn);
if (!msn_soap_write_cb_internal(conn, conn->ssl->fd, PURPLE_INPUT_WRITE, TRUE)) {
/* Not connected => reconnect and retry */
- purple_debug_info("soap", "not connected, reconnecting");
+ purple_debug_info("soap", "not connected, reconnecting\n");
conn->connected = FALSE;
conn->current_request = NULL;
============================================================
--- libpurple/protocols/msn/soap2.h 79076c550a1716a51506268d690788a44b940190
+++ libpurple/protocols/msn/soap.h 57f6d9b66c452a4a12d6651944c78d3423685402
@@ -1,5 +1,5 @@
/**
- * @file soap2.h
+ * @file soap.h
* header file for SOAP connection related process
*
* purple
@@ -23,8 +23,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _MSN_SOAP2_H
-#define _MSN_SOAP2_H
+#ifndef _MSN_SOAP_H
+#define _MSN_SOAP_H
#include "session.h"
#include "sslconn.h"
More information about the Commits
mailing list