Mercurial > pidgin
changeset 20474:416ce8a7ac66
merge of '5d965caa0ea003eef5a1b959791135f900bf10ea'
and 'b41b57944b61fe6aa3f27f7d98376ce73ed181c3'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Sat, 21 Jul 2007 23:56:57 +0000 |
| parents | 49baf4a0ae39 (current diff) c3b23c9f170e (diff) |
| children | 2a2cc0b57d8f |
| files | libpurple/protocols/msn/msn.c libpurple/protocols/msn/notification.c |
| diffstat | 2 files changed, 10 insertions(+), 8 deletions(-) [+] |
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);
--- a/libpurple/protocols/msn/notification.c Sat Jul 21 23:56:16 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Sat Jul 21 23:56:57 2007 +0000 @@ -1160,11 +1160,14 @@ msn_user_set_work_phone(session->user, NULL); else if (!strcmp(type, "PHM")) msn_user_set_mobile_phone(session->user, NULL); - else if (!strcmp(type, "MFM")) { + else { type = cmd->params[1]; - purple_connection_set_display_name( - purple_account_get_connection(session->account), - purple_url_decode(cmd->params[2])); + if (!strcmp(type, "MFN")) { + + purple_connection_set_display_name( + purple_account_get_connection(session->account), + purple_url_decode(cmd->params[2])); + } } } }