Mercurial > pidgin

diff libpurple/protocols/msn/msn.c @ 20474:416ce8a7ac66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '5d965caa0ea003eef5a1b959791135f900bf10ea' and 'b41b57944b61fe6aa3f27f7d98376ce73ed181c3'
author Ka-Hing Cheung <khc@hxbc.us>
date Sat, 21 Jul 2007 23:56:57 +0000
parents 49baf4a0ae39 0b04a7d90470
children 9a2a4a0c0003
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c	Sat Jul 21 23:56:16 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Sat Jul 21 23:56:57 2007 +0000
@@ -569,13 +569,12 @@
 		psm = purple_status_get_attr_string(status, "message");
 		currentmedia = purple_status_get_attr_string(status, "currentmedia");
 
-		purple_notify_user_info_add_pair(user_info, _("Status"),
-									   (purple_presence_is_idle(presence) ? _("Idle") : purple_status_get_name(status)));
-		if (psm) {
+		if (psm && *psm) {
 			tmp = g_markup_escape_text(psm, -1);
-			purple_notify_user_info_add_pair(user_info, _("PSM"), tmp);
+			purple_notify_user_info_add_pair(user_info, _("Status"), tmp);
 			g_free(tmp);
 		}
+
 		if (currentmedia) {
 			tmp = g_markup_escape_text(currentmedia, -1);
 			purple_notify_user_info_add_pair(user_info, _("Current media"), tmp);