diff src/protocols/msn/contact.c @ 19760:cabf9165c9ce

[gaim-migrate @ 16873] change the SOAP process Framework a initial version,can work now committed by Ma Yuan<mayuan2006@gmail.com> committer: Ethan Blanton <elb@pidgin.im>
author Ma Yuan <mayuan2006@gmail.com>
date Sat, 19 Aug 2006 05:52:13 +0000
parents 22eeb4882d77
children 75ecc42d3e8d
line wrap: on
line diff
--- a/src/protocols/msn/contact.c	Fri Aug 18 19:09:07 2006 +0000
+++ b/src/protocols/msn/contact.c	Sat Aug 19 05:52:13 2006 +0000
@@ -30,6 +30,8 @@
 #include "xmlnode.h"
 #include "group.h"
 
+void msn_contact_connect_init(MsnSoapConn *soapconn);
+
 /*new a contact*/
 MsnContact *
 msn_contact_new(MsnSession *session)
@@ -80,7 +82,7 @@
 	g_return_if_fail(session != NULL);
 
 	/*login ok!We can retrieve the contact list*/
-	msn_get_contact_list(contact);
+//	msn_get_contact_list(contact);
 }
 
 /*get MSN member role utility*/
@@ -212,12 +214,13 @@
 {
 	MsnSoapReq *soap_request;
 
+	gaim_debug_info("MaYuan","Getting Contact List...\n");
 	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
 					MSN_GET_CONTACT_POST_URL,MSN_GET_CONTACT_SOAP_ACTION,
 					MSN_GET_CONTACT_TEMPLATE,
 					msn_get_contact_list_cb,
 					msn_get_contact_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 }
 
 static void
@@ -437,7 +440,7 @@
 					MSN_GET_ADDRESS_TEMPLATE,
 					msn_get_address_cb,
 					msn_address_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 }
 
 static void
@@ -483,7 +486,7 @@
 					body,
 					msn_add_contact_read_cb,
 					msn_add_contact_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 
 	g_free(soap_action);
 	g_free(body);
@@ -523,7 +526,7 @@
 					body,
 					msn_delete_contact_read_cb,
 					msn_delete_contact_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 
 	g_free(body);
 }
@@ -559,7 +562,7 @@
 					body,
 					msn_block_read_cb,
 					msn_block_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 
 	g_free(body);
 }
@@ -596,7 +599,7 @@
 					body,
 					msn_unblock_read_cb,
 					msn_unblock_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 
 	g_free(body);
 }
@@ -630,7 +633,7 @@
 					MSN_GLEAMS_TEMPLATE,
 					msn_gleams_read_cb,
 					msn_gleams_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 }
 
 /***************************************************************
@@ -670,7 +673,7 @@
 					body,
 					msn_group_read_cb,
 					msn_group_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 }
 
 /*delete a group*/
@@ -691,18 +694,18 @@
 					body,
 					msn_group_read_cb,
 					msn_group_written_cb);
-	msn_soap_post(contact->soapconn,soap_request);
+	msn_soap_post(contact->soapconn,soap_request,msn_contact_connect_init);
 
 	g_free(body);
 }
 
 void
-msn_contact_connect(MsnContact *contact)
+msn_contact_connect_init(MsnSoapConn *soapconn)
 {
 	/*  Authenticate via Windows Live ID. */
 	gaim_debug_info("MaYuan","msn_contact_connect...\n");
 
-	msn_soap_init(contact->soapconn,MSN_CONTACT_SERVER,1,
+	msn_soap_init(soapconn,MSN_CONTACT_SERVER,1,
 					msn_contact_login_connect_cb,
 					msn_contact_login_error_cb);
 }