Mercurial > pidgin
comparison libpurple/protocols/msn/msn.c @ 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 | 416ce8a7ac66 |
comparison
equal
deleted
inserted
replaced
20462:3537f82db107 | 20463:0b04a7d90470 |
---|---|
567 char *tmp; | 567 char *tmp; |
568 | 568 |
569 psm = purple_status_get_attr_string(status, "message"); | 569 psm = purple_status_get_attr_string(status, "message"); |
570 currentmedia = purple_status_get_attr_string(status, "currentmedia"); | 570 currentmedia = purple_status_get_attr_string(status, "currentmedia"); |
571 | 571 |
572 purple_notify_user_info_add_pair(user_info, _("Status"), | 572 if (psm && *psm) { |
573 (purple_presence_is_idle(presence) ? _("Idle") : purple_status_get_name(status))); | |
574 if (psm) { | |
575 tmp = g_markup_escape_text(psm, -1); | 573 tmp = g_markup_escape_text(psm, -1); |
576 purple_notify_user_info_add_pair(user_info, _("PSM"), tmp); | 574 purple_notify_user_info_add_pair(user_info, _("Status"), tmp); |
577 g_free(tmp); | 575 g_free(tmp); |
578 } | 576 } |
577 | |
579 if (currentmedia) { | 578 if (currentmedia) { |
580 tmp = g_markup_escape_text(currentmedia, -1); | 579 tmp = g_markup_escape_text(currentmedia, -1); |
581 purple_notify_user_info_add_pair(user_info, _("Current media"), tmp); | 580 purple_notify_user_info_add_pair(user_info, _("Current media"), tmp); |
582 g_free(tmp); | 581 g_free(tmp); |
583 } | 582 } |