[gaim-migrate @ 17004]

fix the windows bug of psm

committed by MaYuan<mayuan2006@gmail.com>

committer: Ethan Blanton <elb@pidgin.im>

2 files changed, 3 insertions, 7 deletions

diff --git a/src/protocols/msn/notification.c b/src/protocols/msn/notification.c
index cca84a3ff9..8fe57ace9c 100644
--- a/src/protocols/msn/notification.c
+++ b/src/protocols/msn/notification.c
@@ -1406,9 +1406,6 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 	GaimAccount *account;
 	GaimConnection *gc;
 	MsnUser *user;
-	MsnObject *msnobj;
-	int clientid;
-	int wlmclient;
 	const char *passport, *psm_str;
 
 	/*get the payload content*/
@@ -1422,7 +1419,6 @@ ubx_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 	user = msn_userlist_find_user(session->userlist, passport);
 	
 	psm_str = msn_get_psm(cmd->payload,len);
-	gaim_debug_info("Ma Yuan","got psm {%s}\n", psm_str);
 	msn_user_set_statusline(user, psm_str);
 	msn_user_update(user);
 
diff --git a/src/protocols/msn/state.c b/src/protocols/msn/state.c
index 61f57b7abf..418d3a732b 100644
--- a/src/protocols/msn/state.c
+++ b/src/protocols/msn/state.c
@@ -86,20 +86,20 @@ msn_get_psm(char *xml_str,gsize len)
 {
 	xmlnode *payloadNode, *psmNode;
 	char *psm_str,*psm;
-
+	
+	gaim_debug_info("Ma Yuan","msn get PSM\n");
 	payloadNode = xmlnode_from_str(xml_str, len);
 	if (!payloadNode){
 		gaim_debug_error("MaYuan","PSM XML parse Error!\n");
 		return NULL;
 	}
 	psmNode = xmlnode_get_child(payloadNode, "PSM");
-	if (!psmNode){
+	if (psmNode == NULL){
 		gaim_debug_info("Ma Yuan","No PSM status Node");
 		g_free(payloadNode);
 		return NULL;
 	}
 	psm_str = xmlnode_get_data(psmNode);
-	gaim_debug_info("Ma Yuan","got PSM {%s}\n", psm_str);
 	psm = g_strdup(psm_str);
 
 	g_free(psmNode);