Mercurial > pidgin
comparison src/protocols/msn/msn.c @ 19835:d99e36279d41
[gaim-migrate @ 17181]
add PSM in tooltips
fix oim bug in windows
committed by MaYuan<mayuan2006@gmail.com>
committer: Ethan Blanton <elb@pidgin.im>
author | Ma Yuan <mayuan2006@gmail.com> |
---|---|
date | Wed, 06 Sep 2006 16:14:22 +0000 |
parents | 3b971c87279d |
children |
comparison
equal
deleted
inserted
replaced
19834:2fe6a673f12a | 19835:d99e36279d41 |
---|---|
570 | 570 |
571 user = buddy->proto_data; | 571 user = buddy->proto_data; |
572 | 572 |
573 if (gaim_presence_is_online(presence)) | 573 if (gaim_presence_is_online(presence)) |
574 { | 574 { |
575 char *psm; | |
576 psm = msn_status_text(buddy); | |
577 if (psm) | |
578 g_string_append_printf(str, _("\n<b>%s:</b> %s"), _("Psm"),psm); | |
579 g_free(psm); | |
580 | |
575 g_string_append_printf(str, _("\n<b>%s:</b> %s"), _("Status"), | 581 g_string_append_printf(str, _("\n<b>%s:</b> %s"), _("Status"), |
576 gaim_presence_is_idle(presence) ? | 582 gaim_presence_is_idle(presence) ? |
577 _("Idle") : gaim_status_get_name(status)); | 583 _("Idle") : gaim_status_get_name(status)); |
578 } | 584 } |
579 | 585 |
590 if (user) | 596 if (user) |
591 g_string_append_printf(str, _("\n<b>%s:</b> %s"), _("Blocked"), | 597 g_string_append_printf(str, _("\n<b>%s:</b> %s"), _("Blocked"), |
592 (user->list_op & (1 << MSN_LIST_BL)) ? | 598 (user->list_op & (1 << MSN_LIST_BL)) ? |
593 _("Yes") : _("No")); | 599 _("Yes") : _("No")); |
594 } | 600 } |
595 | |
596 gaim_debug_info("MaYuan","tooltip string:{%s}\n",str); | |
597 } | 601 } |
598 | 602 |
599 static GList * | 603 static GList * |
600 msn_status_types(GaimAccount *account) | 604 msn_status_types(GaimAccount *account) |
601 { | 605 { |