[Gaim-commits] SF.net SVN: gaim: [17004] branches/soc-2006-msnp13/src/protocols/msn

[<may...@us...>]

Revision: 17004
Author:   mayuan2006
Date:     2006-08-23 09:25:54 -0700 (Wed, 23 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=17004&view=rev

Log Message:
-----------
fix the windows bug of psm

committed by MaYuan<may...@gm...>

Modified Paths:
--------------
    branches/soc-2006-msnp13/src/protocols/msn/notification.c
    branches/soc-2006-msnp13/src/protocols/msn/state.c
Modified: branches/soc-2006-msnp13/src/protocols/msn/notification.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/notification.c	2006-08-23 15:07:17 UTC (rev 17003)
+++ branches/soc-2006-msnp13/src/protocols/msn/notification.c	2006-08-23 16:25:54 UTC (rev 17004)
@@ -1406,9 +1406,6 @@
 	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 @@
 	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);
 

Modified: branches/soc-2006-msnp13/src/protocols/msn/state.c
===================================================================
--- branches/soc-2006-msnp13/src/protocols/msn/state.c	2006-08-23 15:07:17 UTC (rev 17003)
+++ branches/soc-2006-msnp13/src/protocols/msn/state.c	2006-08-23 16:25:54 UTC (rev 17004)
@@ -86,20 +86,20 @@
 {
 	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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.