Wed, 23 Aug 2006 16:25:54 +0000
[gaim-migrate @ 17004]
fix the windows bug of psm
committed by MaYuan<mayuan2006@gmail.com>
committer: Ethan Blanton <elb@pidgin.im>
| src/protocols/msn/notification.c | file | annotate | diff | comparison | revisions | |
| src/protocols/msn/state.c | file | annotate | diff | comparison | revisions |
--- a/src/protocols/msn/notification.c Wed Aug 23 15:07:17 2006 +0000 +++ b/src/protocols/msn/notification.c Wed Aug 23 16:25:54 2006 +0000 @@ -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);
--- a/src/protocols/msn/state.c Wed Aug 23 15:07:17 2006 +0000 +++ b/src/protocols/msn/state.c Wed Aug 23 16:25:54 2006 +0000 @@ -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);