changeset 20471:530a92d50c5e

Misc cleanups, better error handling, and print the Address Book received from the server in a human readable way.
author Carlos Silva <typ0@pidgin.im>
date Tue, 17 Jul 2007 00:35:50 +0000
parents 7d6f247f08d9
children 2479ccd1e7fe
files libpurple/protocols/msn/command.c libpurple/protocols/msn/contact.c libpurple/protocols/msn/msn.c libpurple/protocols/msn/msnutils.c libpurple/protocols/msn/nexus.c libpurple/protocols/msn/notification.c libpurple/protocols/msn/oim.c libpurple/protocols/msn/session.c libpurple/protocols/msn/soap.c libpurple/protocols/msn/state.c libpurple/protocols/msn/switchboard.c libpurple/protocols/msn/userlist.c
diffstat 12 files changed, 139 insertions(+), 136 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/command.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/command.c	Tue Jul 17 00:35:50 2007 +0000
@@ -120,7 +120,7 @@
 
 	/*add payload Length checking*/
 	msn_set_payload_len(cmd);
-	purple_debug_info("MaYuan","get payload len:%d\n",cmd->payload_len);
+	purple_debug_info("MSNP14","get payload len:%d\n",cmd->payload_len);
 
 	msn_command_ref(cmd);
 
--- a/libpurple/protocols/msn/contact.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/contact.c	Tue Jul 17 00:35:50 2007 +0000
@@ -315,7 +315,7 @@
 {
 	MsnSoapConn * soapconn = data;	
 
-	purple_debug_info("MaYuan","finish contact written\n");
+	purple_debug_info("MSNP14","finish contact written\n");
 	soapconn->read_cb = msn_get_contact_list_cb;
 //	msn_soap_read_cb(data,source,cond);
 }
@@ -330,7 +330,7 @@
 
 	purple_debug_info("::","msn_get_contact_list()\n");
 
-	purple_debug_info("MaYuan","Getting Contact List...\n");
+	purple_debug_info("MSNP14","Getting Contact List...\n");
 	if(update_time != NULL){
 		purple_debug_info("MSNCL","last update time:{%s}\n",update_time);
 		update_str = g_strdup_printf(MSN_GET_CONTACT_UPDATE_XML,update_time);
@@ -505,31 +505,36 @@
 	xmlnode *groups;
 	xmlnode	*contacts;
 	xmlnode *abNode;
+	gchar *printabledata;
 
 	session = contact->session;
-	purple_debug_misc("xml","parse addressbook:{%s}\nsize:%d\n",contact->soapconn->body,contact->soapconn->body_len);
+
 	node = xmlnode_from_str(contact->soapconn->body, contact->soapconn->body_len);
-
-	if(node == NULL){
-		purple_debug_misc("xml","parse from str err!\n");
+	if ( node == NULL ) {
+		purple_debug_error("MSN SOAP","Error parsing received Address Book with size %d:\n \"%s\"\n", contact->soapconn->body_len, contact->soapconn->body);
 		return FALSE;
 	}
-	purple_debug_misc("xml","node{%p},name:%s,child:%s,last:%s\n",node,node->name,node->child->name,node->lastchild->name);
+
+	printabledata = xmlnode_to_formatted_str(node, NULL);
+	purple_debug_misc("MSN SOAP","Received Address Book with size %d:\n %s\n", contact->soapconn->body_len, (char *) printabledata);
+	g_free(printabledata);
+
+	purple_debug_misc("MSN SOAP","node{%p},name:%s,child:%s,last:%s\n",node,node->name,node->child->name,node->lastchild->name);
 	body = xmlnode_get_child(node,"Body");
-	purple_debug_misc("xml","body{%p},name:%s\n",body,body->name);
+	purple_debug_misc("MSN SOAP","body{%p},name:%s\n",body,body->name);
 	response = xmlnode_get_child(body,"ABFindAllResponse");
 
 	if (response == NULL) {
 		return FALSE;
 	}
 
-	purple_debug_misc("xml","response{%p},name:%s\n",response,response->name);
-	result =xmlnode_get_child(response,"ABFindAllResult");
+	purple_debug_misc("MSN SOAP","response{%p},name:%s\n",response,response->name);
+	result = xmlnode_get_child(response,"ABFindAllResult");
 	if(result == NULL){
 		purple_debug_misc("MSNAB","receive no address book update\n");
 		return TRUE;
 	}
-	purple_debug_misc("xml","result{%p},name:%s\n",result,result->name);
+	purple_debug_info("MSN SOAP","result{%p},name:%s\n",result,result->name);
 
 	/*Process Group List*/
 	groups = xmlnode_get_child(result,"groups");
@@ -613,7 +618,7 @@
 {
 	MsnSoapConn * soapconn = data;	
 
-	purple_debug_info("MaYuan","finish contact written\n");
+	purple_debug_info("MSNP14","finish contact written\n");
 	soapconn->read_cb = msn_get_address_cb;
 }
 
@@ -625,7 +630,7 @@
 	char *body = NULL;
 	char *ab_update_str,*update_str;
 
-	purple_debug_info("MaYuan","msn_get_address_book()...\n");
+	purple_debug_info("::","msn_get_address_book()\n");
 	/*build SOAP and POST it*/
 	if(LastChanged != NULL){
 		ab_update_str = g_strdup_printf(MSN_GET_ADDRESS_UPDATE_XML,LastChanged);
@@ -654,7 +659,7 @@
 static void
 msn_add_contact_read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
-	purple_debug_info("MaYuan","add contact read done\n");
+	purple_debug_info("MSNP14","add contact read done\n");
 }
 
 static void
@@ -662,7 +667,7 @@
 {
 	MsnSoapConn * soapconn = data;	
 
-	purple_debug_info("MaYuan","finish add contact  written\n");
+	purple_debug_info("MSNP14","finish add contact  written\n");
 	soapconn->read_cb = msn_add_contact_read_cb;
 //	msn_soap_read_cb(data,source,cond);
 }
@@ -676,14 +681,14 @@
 	char *contact_xml = NULL;
 	char *soap_action;
 
-	purple_debug_info("MaYuan","msn add a contact...\n");
+	purple_debug_info("::","msn_add_contact()\n");
 	contact_xml = g_strdup_printf(MSN_CONTACT_XML,passport);
-	if(groupId == NULL){
+	if ( groupId == NULL ) {
 		body = g_strdup_printf(MSN_ADD_CONTACT_TEMPLATE,contact_xml);
 		g_free(contact_xml);
 		/*build SOAP and POST it*/
 		soap_action = g_strdup(MSN_CONTACT_ADD_SOAP_ACTION);
-	}else{
+	} else {
 		body = g_strdup_printf(MSN_ADD_CONTACT_GROUP_TEMPLATE,groupId,contact_xml);
 		g_free(contact_xml);
 		/*build SOAP and POST it*/
@@ -703,7 +708,7 @@
 static void
 msn_delete_contact_read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
-	purple_debug_info("MaYuan","delete contact read done\n");
+	purple_debug_info("MSNP14","delete contact read done\n");
 }
 
 static void
@@ -711,7 +716,7 @@
 {
 	MsnSoapConn * soapconn = data;	
 
-	purple_debug_info("MaYuan","delete contact written\n");
+	purple_debug_info("MSNP14","delete contact written\n");
 	soapconn->read_cb = msn_delete_contact_read_cb;
 //	msn_soap_read_cb(data,source,cond);
 }
@@ -725,7 +730,7 @@
 	MsnSoapReq *soap_request;
 
 	g_return_if_fail(contactId != NULL);
-	purple_debug_info("MaYuan","msn delete a contact,contactId:{%s}...\n",contactId);
+	purple_debug_info("MSNP14","msn delete a contact,contactId:{%s}...\n",contactId);
 	contact_xml = g_strdup_printf(MSN_CONTACTS_DEL_XML,contactId);
 	body = g_strdup_printf(MSN_DEL_CONTACT_TEMPLATE,contact_xml);
 	g_free(contact_xml);
@@ -744,7 +749,7 @@
 static void
 msn_update_contact_read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
-	purple_debug_info("MaYuan","update contact read done\n");
+	purple_debug_info("MSNP14","update contact read done\n");
 }
 
 static void
@@ -752,7 +757,7 @@
 {
 	MsnSoapConn * soapconn = data;	
 
-	purple_debug_info("MaYuan","update contact written\n");
+	purple_debug_info("MSNP14","update contact written\n");
 	soapconn->read_cb = msn_update_contact_read_cb;
 //	msn_soap_read_cb(data,source,cond);
 }
@@ -764,7 +769,7 @@
 	MsnSoapReq *soap_request;
 	char *body = NULL;
 
-	purple_debug_info("MaYuan","msn unblock a contact...\n");
+	purple_debug_info("MSNP14","msn unblock a contact...\n");
 
 	body = g_strdup_printf(MSN_CONTACT_UPDATE_TEMPLATE,nickname);
 	/*build SOAP and POST it*/
@@ -782,7 +787,7 @@
 static void
 msn_block_read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
-	purple_debug_info("MaYuan","block read done\n");
+	purple_debug_info("MSNP14","block read done\n");
 }
 
 static void
@@ -790,7 +795,7 @@
 {
 	MsnSoapConn * soapconn = data;	
 
-	purple_debug_info("MaYuan","finish unblock written\n");
+	purple_debug_info("MSNP14","finish unblock written\n");
 	soapconn->read_cb = msn_block_read_cb;
 }
 
@@ -801,7 +806,7 @@
 	MsnSoapReq *soap_request;
 	char *body = NULL;
 
-	purple_debug_info("MaYuan","msn block a contact...\n");
+	purple_debug_info("MSNP14","msn block a contact...\n");
 	body = g_strdup_printf(MSN_CONTACT_DELECT_FROM_ALLOW_TEMPLATE,membership_id);
 	/*build SOAP and POST it*/
 	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
@@ -817,7 +822,7 @@
 static void
 msn_unblock_read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
-	purple_debug_info("MaYuan","unblock read done\n");
+	purple_debug_info("MSNP14","unblock read done\n");
 }
 
 static void
@@ -825,7 +830,7 @@
 {
 	MsnSoapConn * soapconn = data;	
 
-	purple_debug_info("MaYuan","finish unblock written\n");
+	purple_debug_info("MSNP14","finish unblock written\n");
 	soapconn->read_cb = msn_unblock_read_cb;
 }
 
@@ -836,7 +841,7 @@
 	MsnSoapReq *soap_request;
 	char *body = NULL;
 
-	purple_debug_info("MaYuan","msn unblock a contact...\n");
+	purple_debug_info("MSNP14","msn unblock a contact...\n");
 
 	body = g_strdup_printf(MSN_UNBLOCK_CONTACT_TEMPLATE,passport);
 	/*build SOAP and POST it*/
@@ -854,7 +859,7 @@
 static void
 msn_gleams_read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
-	purple_debug_info("MaYuan","Gleams read done\n");
+	purple_debug_info("MSNP14","Gleams read done\n");
 }
 
 static void
@@ -862,7 +867,7 @@
 {
 	MsnSoapConn * soapconn = data;	
 
-	purple_debug_info("MaYuan","finish Group written\n");
+	purple_debug_info("MSNP14","finish Group written\n");
 	soapconn->read_cb = msn_gleams_read_cb;
 //	msn_soap_read_cb(data,source,cond);
 }
@@ -873,7 +878,7 @@
 {
 	MsnSoapReq *soap_request;
 
-	purple_debug_info("MaYuan","msn get gleams info...\n");
+	purple_debug_info("MSNP14","msn get gleams info...\n");
 	/*build SOAP and POST it*/
 	soap_request = msn_soap_request_new(MSN_CONTACT_SERVER,
 					MSN_ADDRESS_BOOK_POST_URL,MSN_GET_GLEAMS_SOAP_ACTION,
@@ -890,7 +895,7 @@
 static void
 msn_group_read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
-	purple_debug_info("MaYuan","Group read \n");
+	purple_debug_info("MSNP14","Group read \n");
 }
 
 static void
@@ -898,7 +903,7 @@
 {
 	MsnSoapConn * soapconn = data;	
 
-	purple_debug_info("MaYuan","finish Group written\n");
+	purple_debug_info("MSNP14","finish Group written\n");
 	soapconn->read_cb = msn_group_read_cb;
 //	msn_soap_read_cb(data,source,cond);
 }
@@ -912,7 +917,7 @@
 
 	g_return_if_fail(session != NULL);
 	contact = session->contact;
-	purple_debug_info("MaYuan","msn add group...\n");
+	purple_debug_info("::","msn_add_group...\n");
 
 	body = g_strdup_printf(MSN_GROUP_ADD_TEMPLATE,group_name);
 	/*build SOAP and POST it*/
@@ -937,7 +942,7 @@
 	 */
 	g_return_if_fail(guid != NULL);
 	contact = session->contact;
-	purple_debug_info("MaYuan","msn del group...\n");
+	purple_debug_info("::","msn_del_group()\n");
 
 	body = g_strdup_printf(MSN_GROUP_DEL_TEMPLATE,guid);
 	/*build SOAP and POST it*/
@@ -955,7 +960,7 @@
 msn_contact_connect_init(MsnSoapConn *soapconn)
 {
 	/*  Authenticate via Windows Live ID. */
-	purple_debug_info("MaYuan","msn_contact_connect...\n");
+	purple_debug_info("::","msn_contact_connect_init()\n");
 
 	msn_soap_init(soapconn,MSN_CONTACT_SERVER,1,
 					msn_contact_login_connect_cb,
--- a/libpurple/protocols/msn/msn.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Tue Jul 17 00:35:50 2007 +0000
@@ -874,7 +874,7 @@
 	char *msgformat;
 	char *msgtext;
 
-	purple_debug_info("MaYuan","send IM {%s} to %s\n",message,who);
+	purple_debug_info("MSNP14","send IM {%s} to %s\n",message,who);
 	account = purple_connection_get_account(gc);
 
 	if (buddy) {
@@ -907,7 +907,7 @@
 		g_free(msgformat);
 		g_free(msgtext);
 
-		purple_debug_info("MaYuan","prepare to send online Message\n");
+		purple_debug_info("MSNP14","prepare to send online Message\n");
 		if (g_ascii_strcasecmp(who, purple_account_get_username(account)))
 		{
 			MsnSession *session;
@@ -916,10 +916,10 @@
 			session = gc->proto_data;
 			if(msn_user_is_yahoo(account,who)){
 				/*we send the online and offline Message to Yahoo User via UBM*/
-				purple_debug_info("MaYuan","send to Yahoo User\n");
+				purple_debug_info("MSNP14","send to Yahoo User\n");
 				uum_send_msg(session,msg);
 			}else{
-				purple_debug_info("MaYuan","send via switchboard\n");
+				purple_debug_info("MSNP14","send via switchboard\n");
 				swboard = msn_session_get_swboard(session, who, MSN_SB_FLAG_IM);
 				msn_switchboard_send_msg(swboard, msg, TRUE);
 			}
@@ -961,7 +961,7 @@
 		MsnOim *oim;
 		char *friendname;
 
-		purple_debug_info("MaYuan","prepare to send offline Message\n");
+		purple_debug_info("MSNP14","prepare to send offline Message\n");
 		session = gc->proto_data;
 		/* XXX/khc: hack */
 		if (!session->oim)
@@ -1111,7 +1111,7 @@
 	userlist = session->userlist;
 	who = msn_normalize(gc->account, buddy->name);
 
-	purple_debug_info("MaYuan","add user:{%s} to group:{%s}\n",who,group->name);
+	purple_debug_info("MSNP14","add user:{%s} to group:{%s}\n",who,group->name);
 	if (!session->logged_in)
 	{
 #if 0
@@ -1395,7 +1395,7 @@
 	cmdproc = session->notification->cmdproc;
 	enc_new_group_name = purple_url_encode(group->name);
 
-	purple_debug_info("MaYuan","rename group:old{%s},new{%s}",old_name,enc_new_group_name);
+	purple_debug_info("MSNP14","rename group:old{%s},new{%s}",old_name,enc_new_group_name);
 	old_gid = msn_userlist_find_group_id(session->userlist, old_name);
 
 	if (old_gid != NULL)
@@ -1985,7 +1985,7 @@
 #if PHOTO_SUPPORT
 	/* Find the URL to the photo; must be before the marshalling [Bug 994207] */
 	photo_url_text = msn_get_photo_url(url_text);
-	purple_debug_info("Ma Yuan","photo url:{%s}\n",photo_url_text);
+	purple_debug_info("MSNP14","photo url:{%s}\n",photo_url_text);
 
 	/* Marshall the existing state */
 	info2_data = g_malloc0(sizeof(MsnGetInfoStepTwoData));
--- a/libpurple/protocols/msn/msnutils.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/msnutils.c	Tue Jul 17 00:35:50 2007 +0000
@@ -481,7 +481,7 @@
 	struct tm ctime;
 	time_t ts;
 
-	purple_debug_info("MaYuan","convert string is{%s}\n",timestr);
+	purple_debug_info("MSNP14","convert string is{%s}\n",timestr);
 	tzset();
 	/*copy string first*/
 	memset(temp, 0, sizeof(temp));
@@ -587,5 +587,5 @@
 
 		output[32]='\0';
 
-//		purple_debug_info("MaYuan","chl output{%s}\n",output);
+//		purple_debug_info("MSNP14","chl output{%s}\n",output);
 }
--- a/libpurple/protocols/msn/nexus.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/nexus.c	Tue Jul 17 00:35:50 2007 +0000
@@ -161,7 +161,7 @@
 	purple_debug_misc("msn", "TWN Server Reply: {%s}\n", soapconn->read_buf);
 
 	/*reply OK, we should process the SOAP body*/
-	purple_debug_info("MaYuan","Windows Live ID Reply OK!\n");
+	purple_debug_info("MSNP14","Windows Live ID Reply OK!\n");
 
 	//TODO: we should parse it using XML
 #ifdef NEXUS_LOGIN_TWN
@@ -205,7 +205,7 @@
 	cert_str = g_strdup_printf("t=%s&p=%s",msn_twn_t,msn_twn_p);
 	msn_got_login_params(session, cert_str);
 
-	purple_debug_info("MaYuan","close nexus connection! \n");
+	purple_debug_info("MSNP14","close nexus connection! \n");
 	g_free(cert_str);
 	g_free(login_params);
 	msn_nexus_destroy(nexus);
@@ -242,7 +242,7 @@
 	char *rst1_str,*rst2_str,*rst3_str;
 #endif
 
-	purple_debug_info("MaYuan","starting Windows Live ID authentication\n");
+	purple_debug_info("MSNP14","starting Windows Live ID authentication\n");
 
 	soapconn = data;
 	g_return_if_fail(soapconn != NULL);
@@ -277,7 +277,7 @@
 	 * for when windows g_strdup_printf() implementation get NULL point,It crashed!
 	 */
 	if(!(lc && id && tw && ru && ct && kpp && kv && ver && tpf)){
-		purple_debug_error("MaYuan","WLM Authenticate Key Error!\n");
+		purple_debug_error("MSNP14","WLM Authenticate Key Error!\n");
 		msn_session_set_error(session, MSN_ERROR_AUTH, _("Windows Live ID authentication Failed"));
 		g_free(username);
 		g_free(password);
@@ -467,7 +467,7 @@
 msn_nexus_connect(MsnNexus *nexus)
 {
 	/*  Authenticate via Windows Live ID. */
-	purple_debug_info("MaYuan","msn_nexus_connect...\n");
+	purple_debug_info("MSNP14","msn_nexus_connect...\n");
 	msn_soap_init(nexus->soapconn,MSN_TWN_SERVER,1,nexus_login_connect_cb,nexus_login_error_cb);
 	msn_soap_connect(nexus->soapconn);
 }
--- a/libpurple/protocols/msn/notification.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Tue Jul 17 00:35:50 2007 +0000
@@ -271,7 +271,7 @@
 			tokens = g_strsplit(*cur, "=", 2);
 			if(tokens[0]&&tokens[1])
 			{
-				purple_debug_info("MaYuan","challenge %p,key:%s,value:%s\n",
+				purple_debug_info("MSNP14","challenge %p,key:%s,value:%s\n",
 									session->nexus->challenge_data,tokens[0],tokens[1]);
 				g_hash_table_insert(session->nexus->challenge_data, tokens[0], tokens[1]);
 			}
@@ -405,7 +405,7 @@
 static void
 msg_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	purple_debug_info("MaYuan","Processing MSG... \n");
+	purple_debug_info("MSNP14","Processing MSG... \n");
 	if(cmd->payload_len == 0){
 		return;
 	}
@@ -420,7 +420,7 @@
 	{
 		g_return_if_fail(cmd->payload_cb != NULL);
 
-		purple_debug_info("MaYuan","MSG payload:{%s}\n",cmd->payload);
+		purple_debug_info("MSNP14","MSG payload:{%s}\n",cmd->payload);
 		cmd->payload_cb(cmdproc, cmd, cmd->payload, cmd->payload_len);
 	}
 }
@@ -438,7 +438,7 @@
 	cmdproc = session->notification->cmdproc;
 	g_return_if_fail(msg     != NULL);
 	payload = msn_message_gen_payload(msg, &payload_len);
-	purple_debug_info("MaYuan","send UUM,payload{%s},strlen:%d,len:%d\n",
+	purple_debug_info("MSNP14","send UUM,payload{%s},strlen:%d,len:%d\n",
 		payload,strlen(payload),payload_len);
 	type = msg->type;
 	trans = msn_transaction_new(cmdproc, "UUM","%s 32 %d %d",msg->remote_user,type,payload_len);
@@ -455,7 +455,7 @@
 	const char *passport;
 	const char *content_type;
 
-	purple_debug_info("MaYuan","Process UBM payload:%s\n",payload);
+	purple_debug_info("MSNP14","Process UBM payload:%s\n",payload);
 	msg = msn_message_new_from_cmd(cmdproc->session, cmd);
 
 	msn_message_parse_payload(msg, payload, len,MSG_LINE_DEM,MSG_BODY_DEM);
@@ -467,7 +467,7 @@
 	passport = msg->remote_user;
 
 	content_type = msn_message_get_content_type(msg);
-	purple_debug_info("MaYuan","type:%d\n",content_type);
+	purple_debug_info("MSNP14","type:%d\n",content_type);
 	if(!strcmp(content_type,"text/plain")){
 		const char *value;
 		const char *body;
@@ -526,7 +526,7 @@
 static void
 ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	purple_debug_info("MaYuan","Processing UBM... \n");
+	purple_debug_info("MSNP14","Processing UBM... \n");
 	if(cmd->payload_len == 0){
 		return;
 	}
@@ -538,7 +538,7 @@
 	}else{
 		g_return_if_fail(cmd->payload_cb != NULL);
 
-		purple_debug_info("MaYuan","UBM payload:{%s}\n",cmd->payload);
+		purple_debug_info("MSNP14","UBM payload:{%s}\n",cmd->payload);
 		ubm_cmd_post(cmdproc, cmd, cmd->payload, cmd->payload_len);
 	}
 }
@@ -572,7 +572,7 @@
 #else
 	msn_handle_chl(cmd->params[1], buf);
 #endif
-//	purple_debug_info("MaYuan","<<challenge:{%s}:{%s}\n",cmd->params[1],buf);
+//	purple_debug_info("MSNP14","<<challenge:{%s}:{%s}\n",cmd->params[1],buf);
 	trans = msn_transaction_new(cmdproc, "QRY", "%s 32", MSNP13_WLM_PRODUCT_ID);
 
 	msn_transaction_set_payload(trans, buf, 32);
@@ -593,7 +593,7 @@
 	char *list_op_str,*type_str;
 
 	purple_debug_info("::","msn_add_contact_xml()\n");
-	purple_debug_info("MaYuan","Passport: %s, type: %d\n",passport, type);
+	purple_debug_info("MSNP14","Passport: %s, type: %d\n",passport, type);
 	tokens = g_strsplit(passport, "@", 2);
 	email = tokens[0];
 	domain = tokens[1];
@@ -602,7 +602,7 @@
 	for(d_node = xmlnode_get_child(mlNode,"d"); d_node; d_node = xmlnode_get_next_twin(d_node))
 	{
 		const char * attr = NULL;
-		purple_debug_info("MaYuan","d_node: %s\n",d_node->name);
+		purple_debug_info("MSNP14","d_node: %s\n",d_node->name);
 		attr = xmlnode_get_attrib(d_node,"n");
 		if(attr == NULL){
 			continue;
@@ -614,7 +614,7 @@
 	if(d_node == NULL)
 	{
 		/*domain not found, create a new domain Node*/
-		purple_debug_info("MaYuan","get No d_node\n");
+		purple_debug_info("MSNP14","get No d_node\n");
 		d_node = xmlnode_new("d");
 		xmlnode_set_attrib(d_node,"n",domain);
 		xmlnode_insert_child(mlNode,d_node);
@@ -625,7 +625,7 @@
 	xmlnode_set_attrib(c_node,"n",email);
 
 	list_op_str = g_strdup_printf("%d",list_op);
-	purple_debug_info("MaYuan","list_op: %d\n",list_op);
+	purple_debug_info("MSNP14","list_op: %d\n",list_op);
 	xmlnode_set_attrib(c_node,"l",list_op_str);
 	g_free(list_op_str);
 
@@ -652,7 +652,7 @@
 {
 	MsnTransaction *trans;
 	purple_debug_info("::","msn_notification_post_adl()\n");
-	purple_debug_info("MaYuan","Sending ADL with payload: %s\n",payload);
+	purple_debug_info("MSNP14","Sending ADL with payload: %s\n",payload);
 	trans = msn_transaction_new(cmdproc, "ADL","%d",strlen(payload));
 	msn_transaction_set_payload(trans, payload, strlen(payload));
 	msn_cmdproc_send_trans(cmdproc, trans);
@@ -740,7 +740,7 @@
 static void
 blp_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	purple_debug_info("MaYuan","Process BLP\n");
+	purple_debug_info("MSNP14","Process BLP\n");
 }
 
 static void
@@ -748,11 +748,11 @@
 {
 	static int initial;
 
-	purple_debug_info("MaYuan","Process ADL\n");
+	purple_debug_info("MSNP14","Process ADL\n");
 
 	if (!initial)
         {
-                purple_debug_info("typ0","Initial ADL received\n");
+                purple_debug_misc("MSNP14","Initial ADL received\n");
                 msn_session_finish_login(cmdproc->session);
         }
 }
@@ -779,14 +779,14 @@
 fqy_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 			 size_t len)
 {
-	purple_debug_info("MaYuan","FQY payload{%s}\n",payload);
+	purple_debug_info("MSNP14","FQY payload{%s}\n",payload);
 	msn_notification_post_adl(cmdproc,payload,len);
 }
 
 static void
 fqy_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	purple_debug_info("MaYuan","Process FQY\n");
+	purple_debug_info("MSNP14","Process FQY\n");
 	cmdproc->last_cmd->payload_cb  = fqy_cmd_post;
 }
 
@@ -798,7 +798,7 @@
 	char * payload;
 #endif
 
-	purple_debug_info("MaYuan","Process RML\n");
+	purple_debug_info("MSNP14","Process RML\n");
 #if 0
 	trans = msn_transaction_new(cmdproc, "RML","");
 
@@ -1506,7 +1506,7 @@
 	buf = xmlnode_to_formatted_str(root, NULL);
 
 	/* get the payload content */
-	purple_debug_info("MaYuan","GCF command payload:\n\"%s\"\n",buf);
+	purple_debug_info("MSNP14","GCF command payload:\n%s\n",buf);
 	
 	g_free(buf);
 	xmlnode_free(root);
@@ -1515,7 +1515,7 @@
 static void
 gcf_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	purple_debug_info("MaYuan","Processing GCF command\n");
+	purple_debug_info("MSNP14","Processing GCF command\n");
 	cmdproc->last_cmd->payload_cb  = gcf_cmd_post;
 	return;
 }
@@ -1523,7 +1523,7 @@
 static void
 sbs_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	purple_debug_info("MaYuan","Processing SBS... \n");
+	purple_debug_info("MSNP14","Processing SBS... \n");
 	if(cmd->payload_len == 0){
 		return;
 	}
@@ -1547,7 +1547,7 @@
 	char *psm_str, *currentmedia_str;
 
 	/*get the payload content*/
-//	purple_debug_info("MaYuan","UBX {%s} payload{%s}\n",cmd->params[0], cmd->payload);
+//	purple_debug_info("MSNP14","UBX {%s} payload{%s}\n",cmd->params[0], cmd->payload);
 
 	session = cmdproc->session;
 	account = session->account;
@@ -1571,7 +1571,7 @@
 static void
 ubx_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	purple_debug_info("typ0","UBX received.\n");
+	purple_debug_misc("MSNP14","UBX received.\n");
 	if(cmd->payload_len == 0){
 		return;
 	}
@@ -1581,7 +1581,7 @@
 static void
 uux_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	purple_debug_info("typ0","UUX received.\n");
+	purple_debug_misc("MSNP14","UUX received.\n");
 }
 
 /**************************************************************************
@@ -1934,7 +1934,7 @@
 	payload = xmlnode_to_str(rml_node,&payload_len);
 	xmlnode_free(rml_node);
 
-	purple_debug_info("MaYuan","Send RML with payload {%s}\n",payload);
+	purple_debug_info("MSNP14","Send RML with payload {%s}\n",payload);
 	trans = msn_transaction_new(cmdproc, "RML","%d",strlen(payload));
 	msn_transaction_set_payload(trans, payload, strlen(payload));
 	msn_cmdproc_send_trans(cmdproc, trans);
--- a/libpurple/protocols/msn/oim.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/oim.c	Tue Jul 17 00:35:50 2007 +0000
@@ -120,9 +120,9 @@
 {
 	char *oim_body,*oim_base64;
 	
-	purple_debug_info("MaYuan","encode OIM Message...\n");	
+	purple_debug_info("MSNP14","encode OIM Message...\n");	
 	oim_base64 = purple_base64_encode((const guchar *)body, strlen(body));
-	purple_debug_info("MaYuan","encoded base64 body:{%s}\n",oim_base64);	
+	purple_debug_info("MSNP14","encoded base64 body:{%s}\n",oim_base64);	
 	oim_body = g_strdup_printf(MSN_OIM_MSG_TEMPLATE,
 				oim->run_id,oim->send_seq,oim_base64);
 
@@ -178,7 +178,7 @@
 		/*Send OK! return*/
 		MsnOimSendReq *request;
 		
-		purple_debug_info("MaYuan","send OIM OK!");
+		purple_debug_info("MSNP14","send OIM OK!");
 		xmlnode_free(responseNode);
 		request = g_queue_pop_head(oim->send_queue);
 		msn_oim_free_send_req(request);
@@ -189,11 +189,11 @@
 	/*get the challenge,and repost it*/
 	faultCodeNode = xmlnode_get_child(faultNode,"faultcode");
 	if(faultCodeNode == NULL){
-		purple_debug_info("MaYuan","faultcode Node is NULL\n");
+		purple_debug_info("MSNP14","faultcode Node is NULL\n");
 		goto oim_send_process_fail;
 	}
 	faultCodeStr = xmlnode_get_data(faultCodeNode);
-	purple_debug_info("MaYuan","fault code:{%s}\n",faultCodeStr);
+	purple_debug_info("MSNP14","fault code:{%s}\n",faultCodeStr);
 
 	if(!strcmp(faultCodeStr,"q0:AuthenticationFailed")){
 		/*other Fault Reason?*/
@@ -202,7 +202,7 @@
 
 	faultstringNode = xmlnode_get_child(faultNode,"faultstring");
 	faultstring = xmlnode_get_data(faultstringNode);
-	purple_debug_info("MaYuan","fault string :{%s}\n",faultstring);
+	purple_debug_info("MSNP14","fault string :{%s}\n",faultstring);
 
 	/* lock key fault reason,
 	 * compute the challenge and resend it
@@ -218,10 +218,10 @@
 
 	g_free(oim->challenge);
 	oim->challenge = xmlnode_get_data(challengeNode);
-	purple_debug_info("MaYuan","lockkey:{%s}\n",oim->challenge);
+	purple_debug_info("MSNP14","lockkey:{%s}\n",oim->challenge);
 
 	/*repost the send*/
-	purple_debug_info("MaYuan","prepare to repost the send...\n");
+	purple_debug_info("MSNP14","prepare to repost the send...\n");
 	msn_oim_send_msg(oim);
 
 oim_send_process_fail:
@@ -240,7 +240,7 @@
 	oim = soapconn->session->oim;
 	g_return_if_fail(oim != NULL);
 
-	purple_debug_info("MaYuan","read buffer:{%s}\n",soapconn->body);
+	purple_debug_info("MSNP14","read buffer:{%s}\n",soapconn->body);
 	msn_oim_send_process(oim,soapconn->body,soapconn->body_len);
 }
 
@@ -280,7 +280,7 @@
 	oim_request = g_queue_pop_head(oim->send_queue);
 	g_return_if_fail(oim_request != NULL);
 
-	purple_debug_info("MaYuan","send single OIM Message\n");
+	purple_debug_info("MSNP14","send single OIM Message\n");
 	mspauth = g_strdup_printf("t=%s&amp;p=%s",
 		oim->session->passport_info.t,
 		oim->session->passport_info.p
@@ -293,10 +293,10 @@
 	if(oim->challenge != NULL){
 		msn_handle_chl(oim->challenge, buf);
 	}else{
-		purple_debug_info("MaYuan","no lock key challenge,wait for SOAP Fault and Resend\n");
+		purple_debug_info("MSNP14","no lock key challenge,wait for SOAP Fault and Resend\n");
 		buf[0]='\0';
 	}
-	purple_debug_info("MaYuan","get the lock key challenge {%s}\n",buf);	
+	purple_debug_info("MSNP14","get the lock key challenge {%s}\n",buf);	
 
 	msg_body = msn_oim_msg_to_str(oim, oim_request->oim_msg);
 	soap_body = g_strdup_printf(MSN_OIM_SEND_TEMPLATE,
@@ -333,7 +333,7 @@
 {
 	MsnSoapConn * soapconn = data;
 
-	purple_debug_info("MaYuan","OIM delete read buffer:{%s}\n",soapconn->body);
+	purple_debug_info("MSNP14","OIM delete read buffer:{%s}\n",soapconn->body);
 
 	msn_soap_free_read_buf(soapconn);
 	/*get next single Offline Message*/
@@ -358,7 +358,7 @@
 	g_return_if_fail(oim != NULL);
 	g_return_if_fail(msgid != NULL);
 
-	purple_debug_info("MaYuan","Delete single OIM Message {%s}\n",msgid);
+	purple_debug_info("MSNP14","Delete single OIM Message {%s}\n",msgid);
 	t = oim->session->passport_info.t;
 	p = oim->session->passport_info.p;
 
@@ -407,7 +407,7 @@
 	session = oim->session;
 	g_return_if_fail(session != NULL);
 
-	purple_debug_info("MaYuan","oim get SOAP Server connected!\n");
+	purple_debug_info("MSNP14","oim get SOAP Server connected!\n");
 }
 
 /*Post the Offline Instant Message to User Conversation*/
@@ -428,7 +428,7 @@
 
 	msn_message_parse_payload(message, msg_str, strlen(msg_str),
 							  MSG_OIM_LINE_DEM, MSG_OIM_BODY_DEM);
-	purple_debug_info("MaYuan","oim body:{%s}\n",message->body);
+	purple_debug_info("MSNP14","oim body:{%s}\n",message->body);
 	decode_msg = (char *)purple_base64_decode(message->body,&body_len);
 	date =	(char *)g_hash_table_lookup(message->attr_table, "Date");
 	from =	(char *)g_hash_table_lookup(message->attr_table, "From");
@@ -438,12 +438,12 @@
 	if(has_nick){
 		tokens = g_strsplit(from , " " , 2);
 		passport_str = g_strdup(tokens[1]);
-		purple_debug_info("MaYuan","oim Date:{%s},nickname:{%s},tokens[1]:{%s} passport{%s}\n",
+		purple_debug_info("MSNP14","oim Date:{%s},nickname:{%s},tokens[1]:{%s} passport{%s}\n",
 							date,tokens[0],tokens[1],passport_str);
 		g_strfreev(tokens);
 	}else{
 		passport_str = g_strdup(from);
-		purple_debug_info("MaYuan","oim Date:{%s},passport{%s}\n",
+		purple_debug_info("MSNP14","oim Date:{%s},passport{%s}\n",
 					date,passport_str);
 	}
 	start = strstr(passport_str,"<");
@@ -451,7 +451,7 @@
 	end = strstr(passport_str,">");
 	passport = g_strndup(start,end - start);
 	g_free(passport_str);
-	purple_debug_info("MaYuan","oim Date:{%s},passport{%s}\n",date,passport);
+	purple_debug_info("MSNP14","oim Date:{%s},passport{%s}\n",date,passport);
 
 	stamp = purple_str_to_time(date, TRUE, NULL, NULL, NULL);
 
@@ -498,7 +498,7 @@
 	MsnSoapConn * soapconn = data;
 	MsnOim * oim = soapconn->session->oim;
 
-	purple_debug_info("MaYuan","OIM get read buffer:{%s}\n",soapconn->body);
+	purple_debug_info("MSNP14","OIM get read buffer:{%s}\n",soapconn->body);
 
 	/*we need to process the read message!*/
 	msn_oim_get_process(oim,soapconn->body);
@@ -572,7 +572,7 @@
 			rTime = xmlnode_get_data(rtNode);
 			rtNode = NULL;
 		}
-/*		purple_debug_info("MaYuan","E:{%s},I:{%s},rTime:{%s}\n",passport,msgid,rTime); */
+/*		purple_debug_info("MSNP14","E:{%s},I:{%s},rTime:{%s}\n",passport,msgid,rTime); */
 
 		oim->oim_list = g_list_append(oim->oim_list,msgid);
 		msn_oim_post_single_get_msg(oim,msgid);
@@ -592,7 +592,7 @@
 	MsnSoapReq *soap_request;
 	const char *soap_body,*t,*p;
 
-	purple_debug_info("MaYuan","Get single OIM Message\n");
+	purple_debug_info("MSNP14","Get single OIM Message\n");
 	t = oim->session->passport_info.t;
 	p = oim->session->passport_info.p;
 
@@ -613,7 +613,7 @@
 static void
 msn_oim_retrieve_connect_init(MsnSoapConn *soapconn)
 {
-	purple_debug_info("MaYuan","msn_oim_connect...\n");
+	purple_debug_info("MSNP14","msn_oim_connect...\n");
 	msn_soap_init(soapconn,MSN_OIM_RETRIEVE_HOST,1,
 					msn_oim_get_connect_cb,
 					msn_oim_get_error_cb);
@@ -623,7 +623,7 @@
 static void
 msn_oim_send_connect_init(MsnSoapConn *sendconn)
 {
-	purple_debug_info("MaYuan","msn oim send connect init...\n");
+	purple_debug_info("MSNP14","msn oim send connect init...\n");
 	msn_soap_init(sendconn,MSN_OIM_SEND_HOST,1,
 					msn_oim_send_connect_cb,
 					msn_oim_send_error_cb);
--- a/libpurple/protocols/msn/session.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/session.c	Tue Jul 17 00:35:50 2007 +0000
@@ -300,17 +300,17 @@
 						const char *group_id;
 						GList *l;
 
-						purple_debug_info("MaYuan","remote user:{%s}\n",b->name);
+						purple_debug_info("MSNP14","remote user:{%s}\n",b->name);
 						group_id = msn_userlist_find_group_id(remote_user->userlist,
 								group_name);
 						if(group_id == NULL){
 							continue;
 						}
-						purple_debug_info("MaYuan","group_id:{%s}\n",group_id);
+						purple_debug_info("MSNP14","group_id:{%s}\n",group_id);
 
 						for (l = remote_user->group_ids; l != NULL; l = l->next)
 						{
-							purple_debug_info("MaYuan","l->data:{%s}\n",l->data);
+							purple_debug_info("MSNP14","l->data:{%s}\n",l->data);
 							if (!g_strcasecmp(group_id ,l->data))
 							{
 								found = TRUE;
--- 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*/
--- a/libpurple/protocols/msn/state.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/state.c	Tue Jul 17 00:35:50 2007 +0000
@@ -185,15 +185,15 @@
 	xmlnode *payloadNode, *psmNode;
 	char *psm_str, *psm;
 	
-	purple_debug_info("Ma Yuan","msn get PSM\n");
+	purple_debug_info("MSNP14","msn get PSM\n");
 	payloadNode = xmlnode_from_str(xml_str, len);
 	if (!payloadNode){
-		purple_debug_error("MaYuan","PSM XML parse Error!\n");
+		purple_debug_error("MSNP14","PSM XML parse Error!\n");
 		return NULL;
 	}
 	psmNode = xmlnode_get_child(payloadNode, "PSM");
 	if (psmNode == NULL){
-		purple_debug_info("Ma Yuan","No PSM status Node");
+		purple_debug_info("MSNP14","No PSM status Node");
 		g_free(payloadNode);
 		return NULL;
 	}
@@ -235,7 +235,7 @@
 	session->psm = msn_build_psm(statusline, NULL, NULL);
 	payload = session->psm;
 
-	purple_debug_info("MaYuan","UUX{%s}\n",payload);
+	purple_debug_info("MSNP14","UUX{%s}\n",payload);
 	trans = msn_transaction_new(cmdproc, "UUX","%d",strlen(payload));
 	msn_transaction_set_payload(trans, payload, strlen(payload));
 	msn_cmdproc_send_trans(cmdproc, trans);
--- a/libpurple/protocols/msn/switchboard.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Tue Jul 17 00:35:50 2007 +0000
@@ -534,7 +534,7 @@
 	payload = msn_message_gen_payload(msg, &payload_len);
 
 #ifdef MSN_DEBUG_SB
-	purple_debug_info("MaYuan","SB length:{%d}",payload_len);
+	purple_debug_info("MSNP14","SB length:{%d}",payload_len);
 	msn_message_show_readable(msg, "SB SEND", FALSE);
 #endif
 
@@ -622,7 +622,7 @@
 	g_return_if_fail(swboard != NULL);
 	g_return_if_fail(msg     != NULL);
 
-	purple_debug_info("Ma Yuan","switchboard send msg..\n");
+	purple_debug_info("MSNP14","switchboard send msg..\n");
 	if (msn_switchboard_can_send(swboard))
 		release_msg(swboard, msg);
 	else if (queue)
@@ -754,7 +754,7 @@
 static void
 ubm_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 {
-	purple_debug_misc("MaYuan","get UBM...\n");
+	purple_debug_misc("MSNP14","get UBM...\n");
 	cmdproc->servconn->payload_len = atoi(cmd->params[4]);
 	cmdproc->last_cmd->payload_cb = msg_cmd_post;
 }
@@ -1124,7 +1124,7 @@
 	/*offline Message send Process*/
 
 	while ((msg = g_queue_pop_head(swboard->msg_queue)) != NULL){
-		purple_debug_warning("Ma Yuan","offline msg to send:{%s}\n",msg->body);
+		purple_debug_warning("MSNP14","offline msg to send:{%s}\n",msg->body);
 		/* The messages could not be sent due to a switchboard error */
 		swboard->error = MSN_SB_ERROR_USER_OFFLINE;
 		msg_error_helper(swboard->cmdproc, msg,
@@ -1174,7 +1174,7 @@
 		/* The conversation window was closed. */
 		return;
 
-	purple_debug_info("MaYuan","Switchboard:auth:{%s} socket:{%s}\n",cmd->params[4],cmd->params[2]);
+	purple_debug_info("MSNP14","Switchboard:auth:{%s} socket:{%s}\n",cmd->params[4],cmd->params[2]);
 	msn_switchboard_set_auth_key(swboard, cmd->params[4]);
 
 	msn_parse_socket(cmd->params[2], &host, &port);
--- a/libpurple/protocols/msn/userlist.c	Mon Jul 16 23:06:21 2007 +0000
+++ b/libpurple/protocols/msn/userlist.c	Tue Jul 17 00:35:50 2007 +0000
@@ -205,7 +205,7 @@
 	const char *passport;
 	const char *friendly;
 
-	purple_debug_info("MaYuan","got add user...\n");
+	purple_debug_info("MSNP14","got add user...\n");
 	account = session->account;
 
 	passport = msn_user_get_passport(user);
@@ -350,8 +350,6 @@
 	const char *passport;
 	const char *store;
 
-	purple_debug_info("::","msn_got_lst_user()\n");
-
 	account = session->account;
 	gc = purple_account_get_connection(account);
 
@@ -661,7 +659,7 @@
 	const char *list;
 	const char *store_name;
 
-	purple_debug_info("MaYuan", "userlist add buddy,name:{%s},group:{%s}\n",who ,group_name);
+	purple_debug_info("MSNP14", "userlist add buddy,name:{%s},group:{%s}\n",who ,group_name);
 	group_id = NULL;
 
 	if (!purple_email_is_valid(who))
@@ -715,7 +713,7 @@
 	/* Then request the add to the server. */
 	list = lists[list_id];
 
-	purple_debug_info("MaYuan", "add user:{%s} to group id {%s}\n",store_name ,group_id);
+	purple_debug_info("MSNP14", "add user:{%s} to group id {%s}\n",store_name ,group_id);
 	msn_add_contact(userlist->session->contact,who,group_id);
 	msn_notification_add_buddy(userlist->session->notification, list, who,
 							   store_name, group_id);