diff libpurple/protocols/msn/soap.c @ 20471:530a92d50c5e

Misc cleanups, better error handling, and print the Address Book received from the server in a human readable way.

--- a/libpurple/protocols/msn/soap.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/soap.c	Tue Jul 17 00:35:50 2007 +0000
@@ -68,7 +68,7 @@
 	MsnSoapConn * soapconn;
 	MsnSession *session;
 
-	purple_debug_info("MaYuan","Soap connection connected!\n");
+	purple_debug_info("MSNP14","Soap connection connected!\n");
 	soapconn = data;
 	g_return_if_fail(soapconn != NULL);
 
@@ -94,7 +94,7 @@
 	MsnSoapConn * soapconn = data;
 
 	g_return_if_fail(data != NULL);
-	purple_debug_info("MaYuan","Soap connection error!\n");
+	purple_debug_info("MSNP14","Soap connection error!\n");
 	msn_soap_set_process_step(soapconn, MSN_SOAP_UNCONNECTED);
 
 	/*error callback*/
@@ -109,7 +109,7 @@
 				PurpleSslInputFunction	connect_cb,
 				PurpleSslErrorFunction	error_cb)
 {
-	purple_debug_info("MaYuan","msn_soap_init...\n");
+	purple_debug_info("MSNP14","msn_soap_init...\n");
 	soapconn->login_host = g_strdup(host);
 	soapconn->ssl_conn = ssl;
 	soapconn->connect_cb = connect_cb;
@@ -221,8 +221,8 @@
 		soapconn->read_buf[soapconn->read_len] = '\0';
 	}
 #ifdef MSN_SOAP_DEBUG
-	purple_debug_info("MaYuan","++soap ssl read:{%d}\n",len);
-	purple_debug_info("MaYuan","nexus ssl read:{%s}\n",soapconn->read_buf);
+	purple_debug_info("MSNP14","++soap ssl read:{%d}\n",len);
+	purple_debug_info("MSNP14","nexus ssl read:{%s}\n",soapconn->read_buf);
 #endif
 	return len;
 }
@@ -237,7 +237,7 @@
 	char * body_start,*body_len;
 	char *length_start,*length_end;
 
-//	purple_debug_misc("MaYuan", "soap read cb\n");
+//	purple_debug_misc("MSNP14", "soap read cb\n");
 	session = soapconn->session;
 	g_return_if_fail(session != NULL);
 
@@ -270,7 +270,7 @@
 		/* Redirect. */
 		char *location, *c;
 
-		purple_debug_error("MaYuan", "soap redirect\n");
+		purple_debug_error("MSNP14", "soap redirect\n");
 		location = strstr(soapconn->read_buf, "Location: ");
 		if (location == NULL)
 		{
@@ -343,7 +343,7 @@
 	{
 		const char *error;
 
-		purple_debug_error("MaYuan", "soap 401\n");
+		purple_debug_error("MSNP14", "soap 401\n");
 		if ((error = strstr(soapconn->read_buf, "WWW-Authenticate")) != NULL)
 		{
 			if ((error = strstr(error, "cbtxt=")) != NULL)
@@ -408,7 +408,7 @@
 			soapconn->body		= body_start;
 			soapconn->body_len	= atoi(body_len);
 #ifdef MSN_SOAP_DEBUG
-			purple_debug_misc("MaYuan","SOAP Read length :%d,body len:%d\n",soapconn->read_len,soapconn->body_len);
+			purple_debug_misc("MSNP14","SOAP Read length :%d,body len:%d\n",soapconn->read_len,soapconn->body_len);
 #endif
 			soapconn->need_to_read = (body_start - soapconn->read_buf +soapconn->body_len) - soapconn->read_len;
 			if(soapconn->need_to_read >0){
@@ -468,7 +468,7 @@
 
 	g_return_if_fail(soapconn != NULL);
 	if(soapconn->write_buf == NULL){
-		purple_debug_error("MaYuan","soap buffer is NULL\n");
+		purple_debug_error("MSNP14","soap buffer is NULL\n");
 		purple_input_remove(soapconn->output_handler);
 		soapconn->output_handler = -1;
 		return;
@@ -592,12 +592,12 @@
 	if(!msn_soap_connected(soapconn)&&(soapconn->step == MSN_SOAP_UNCONNECTED)
 					&&(!g_queue_is_empty(soapconn->soap_queue))){
 		/*not connected?and we have something to process connect it first*/
-		purple_debug_info("Ma Yuan","soap is not connected!\n");
+		purple_debug_info("MSNP14","soap is not connected!\n");
 		msn_soap_init_func(soapconn);
 		msn_soap_connect(soapconn);
 		return;
 	}
-	purple_debug_info("Ma Yuan","soap  connected!\n");
+	purple_debug_info("MSNP14","soap  connected!\n");
 
 	/*if connected, what we only needed to do is to queue the request, 
 	 * when SOAP request in the queue processed done, will do this command.
@@ -618,7 +618,7 @@
 	char * soap_head = NULL;
 	char * request_str = NULL;
 
-	purple_debug_info("MaYuan","msn_soap_post_request()...\n");
+	purple_debug_info("MSNP14","msn_soap_post_request()...\n");
 	msn_soap_set_process_step(soapconn,MSN_SOAP_PROCESSING);
 	soap_head = g_strdup_printf(
 					"POST %s HTTP/1.1\r\n"
@@ -641,7 +641,7 @@
 	g_free(soap_head);
 
 #ifdef MSN_SOAP_DEBUG
-	purple_debug_info("MaYuan","send to  server{%s}\n",request_str);
+	purple_debug_info("MSNP14","send to  server{%s}\n",request_str);
 #endif
 
 	/*free read buffer*/