Mercurial > pidgin

comparison libpurple/protocols/jabber/buddy.c @ 31916:757fc30ca2ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '88118487bea2cf5120dec21de3377fada185180f' and 'ccb72e4a80d5403e1261e3fb8e1bd07f83e92fcd'
author Mark Doliner <mark@kingant.net>
date Mon, 22 Aug 2011 06:06:07 +0000
parents e1b70ca6bfd7 16f241146576
children c0e01ee203b1
comparison
equal deleted inserted replaced
31914:e1b70ca6bfd7 31916:757fc30ca2ab
731 char *tmp; 731 char *tmp;
732 char priority[12]; 732 char priority[12];
733 const char *status_name = jabber_buddy_state_get_name(jbr->state); 733 const char *status_name = jabber_buddy_state_get_name(jbr->state);
734 734
735 g_snprintf(priority, sizeof(priority), "%d", jbr->priority); 735 g_snprintf(priority, sizeof(priority), "%d", jbr->priority);
736 purple_notify_user_info_add_pair_plaintext(user_info, _("Priority"), priority); 736 purple_notify_user_info_add_pair_html(user_info, _("Priority"), priority);
737 737
738 if (jbr->status) { 738 if (jbr->status) {
739 tmp = purple_markup_escape_text(jbr->status, -1); 739 tmp = purple_markup_escape_text(jbr->status, -1);
740 purdy = purple_strdup_withhtml(tmp); 740 purdy = purple_strdup_withhtml(tmp);
741 g_free(tmp); 741 g_free(tmp);
750 purple_notify_user_info_add_pair_html(user_info, _("Status"), tmp); 750 purple_notify_user_info_add_pair_html(user_info, _("Status"), tmp);
751 751
752 g_free(tmp); 752 g_free(tmp);
753 g_free(purdy); 753 g_free(purdy);
754 } else { 754 } else {
755 purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), _("Unknown")); 755 purple_notify_user_info_add_pair_html(user_info, _("Status"), _("Unknown"));
756 } 756 }
757 757
758 if (jbir && jbir->idle_seconds > 0) { 758 if (jbir && jbir->idle_seconds > 0) {
759 char *idle = purple_str_seconds_to_string(jbir->idle_seconds); 759 char *idle = purple_str_seconds_to_string(jbir->idle_seconds);
760 purple_notify_user_info_add_pair_plaintext(user_info, _("Idle"), idle); 760 purple_notify_user_info_add_pair_html(user_info, _("Idle"), idle);
761 g_free(idle); 761 g_free(idle);
762 } 762 }
763 763
764 if (jbr && jbr->tz_off != PURPLE_NO_TZ_OFF) { 764 if (jbr && jbr->tz_off != PURPLE_NO_TZ_OFF) {
765 time_t now_t; 765 time_t now_t;
772 timestamp = 772 timestamp =
773 g_strdup_printf("%s %c%02d%02d", purple_time_format(now), 773 g_strdup_printf("%s %c%02d%02d", purple_time_format(now),
774 jbr->tz_off < 0 ? '-' : '+', 774 jbr->tz_off < 0 ? '-' : '+',
775 abs(jbr->tz_off / (60*60)), 775 abs(jbr->tz_off / (60*60)),
776 abs((jbr->tz_off % (60*60)) / 60)); 776 abs((jbr->tz_off % (60*60)) / 60));
777 purple_notify_user_info_add_pair_plaintext(user_info, _("Local Time"), timestamp); 777 purple_notify_user_info_add_pair_html(user_info, _("Local Time"), timestamp);
778 g_free(timestamp); 778 g_free(timestamp);
779 } 779 }
780 780
781 if (jbr && jbr->client.name) { 781 if (jbr && jbr->client.name) {
782 char *tmp; 782 char *tmp;