Mercurial > pidgin.yaz
changeset 20463:0b04a7d90470
removed "PSM:" label and move the message to "Status:" to be consistent with
other prpls
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Sat, 21 Jul 2007 19:47:42 +0000 |
| parents | 3537f82db107 |
| children | c3b23c9f170e |
| files | libpurple/protocols/msn/msn.c |
| diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/msn.c Sat Jul 21 19:39:38 2007 +0000 +++ b/libpurple/protocols/msn/msn.c Sat Jul 21 19:47:42 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);