# HG changeset patch
# User Ma Yuan <mayuan2006@gmail.com>
# Date 1157559262 0
# Node ID d99e36279d41554af0fb1b646a4fec981a8b9488
# Parent  2fe6a673f12a10bdb44abfbc8e25a2b2debcafa9
[gaim-migrate @ 17181]
add PSM in tooltips
fix oim bug in windows
committed by MaYuan<mayuan2006@gmail.com>

committer: Ethan Blanton <elb@pidgin.im>

diff -r 2fe6a673f12a -r d99e36279d41 src/protocols/msn/msn.c
--- a/src/protocols/msn/msn.c	Sun Sep 03 16:27:11 2006 +0000
+++ b/src/protocols/msn/msn.c	Wed Sep 06 16:14:22 2006 +0000
@@ -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 *
diff -r 2fe6a673f12a -r d99e36279d41 src/protocols/msn/oim.c
--- a/src/protocols/msn/oim.c	Sun Sep 03 16:27:11 2006 +0000
+++ b/src/protocols/msn/oim.c	Wed Sep 06 16:14:22 2006 +0000
@@ -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);