From: <may...@us...> - 2006-09-06 16:14:28
|
Revision: 17181 http://svn.sourceforge.net/gaim/?rev=17181&view=rev Author: mayuan2006 Date: 2006-09-06 09:14:22 -0700 (Wed, 06 Sep 2006) Log Message: ----------- add PSM in tooltips fix oim bug in windows committed by MaYuan<may...@gm...> Modified Paths: -------------- branches/soc-2006-msnp13/src/protocols/msn/msn.c branches/soc-2006-msnp13/src/protocols/msn/oim.c Modified: branches/soc-2006-msnp13/src/protocols/msn/msn.c =================================================================== --- branches/soc-2006-msnp13/src/protocols/msn/msn.c 2006-09-06 10:06:58 UTC (rev 17180) +++ branches/soc-2006-msnp13/src/protocols/msn/msn.c 2006-09-06 16:14:22 UTC (rev 17181) @@ -572,6 +572,12 @@ if (gaim_presence_is_online(presence)) { + char *psm; + psm = msn_status_text(buddy); + if (psm) + g_string_append_printf(str, _("\n<b>%s:</b> %s"), _("Psm"),psm); + g_free(psm); + g_string_append_printf(str, _("\n<b>%s:</b> %s"), _("Status"), gaim_presence_is_idle(presence) ? _("Idle") : gaim_status_get_name(status)); @@ -592,8 +598,6 @@ (user->list_op & (1 << MSN_LIST_BL)) ? _("Yes") : _("No")); } - - gaim_debug_info("MaYuan","tooltip string:{%s}\n",str); } static GList * Modified: branches/soc-2006-msnp13/src/protocols/msn/oim.c =================================================================== --- branches/soc-2006-msnp13/src/protocols/msn/oim.c 2006-09-06 10:06:58 UTC (rev 17180) +++ branches/soc-2006-msnp13/src/protocols/msn/oim.c 2006-09-06 16:14:22 UTC (rev 17181) @@ -491,15 +491,20 @@ mdNode = xmlnode_from_str(xmlmsg, strlen(xmlmsg)); for(mNode = xmlnode_get_child(mdNode, "M"); mNode; mNode = xmlnode_get_next_twin(mNode)){ + /*email Node*/ ENode = xmlnode_get_child(mNode,"E"); passport = xmlnode_get_data(ENode); + /*Index */ INode = xmlnode_get_child(mNode,"I"); msgid = xmlnode_get_data(INode); - rtNode = xmlnode_get_child(mNode,"RT"); - rTime = xmlnode_get_data(rtNode); + /*Nickname*/ nNode = xmlnode_get_child(mNode,"N"); nickname = xmlnode_get_data(nNode); - gaim_debug_info("MaYuan","E:{%s},I:{%s},rTime:{%s}\n",passport,msgid,rTime); + /*receive time*/ + rtNode = xmlnode_get_child(mNode,"RT"); + if(rtNode != NULL) + rTime = xmlnode_get_data(rtNode); +/* gaim_debug_info("MaYuan","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); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |