Mercurial > pidgin.yaz
diff libpurple/protocols/yahoo/libymsg.c @ 31811:41f1e44ad4b5
propagate from branch 'im.pidgin.pidgin' (head 6f879669a6513a5c40335bbaefe842389a92b39e)
to branch 'im.pidgin.pidgin.next.minor' (head 8cdcfae03192b964373cd95a73342d30ed15d13a)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sat, 20 Nov 2010 13:02:08 +0000 |
| parents | 943fce8ef142 0123c69ec0e5 |
| children | ea2a155b4439 |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/libymsg.c Sat Nov 20 09:21:29 2010 +0000 +++ b/libpurple/protocols/yahoo/libymsg.c Sat Nov 20 13:02:08 2010 +0000 @@ -3975,7 +3975,6 @@ void yahoo_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gboolean full) { YahooFriend *f; - char *escaped; char *status = NULL; const char *presence = NULL; PurpleAccount *account; @@ -4014,14 +4013,12 @@ } if (status != NULL) { - escaped = g_markup_escape_text(status, strlen(status)); - purple_notify_user_info_add_pair(user_info, _("Status"), escaped); + purple_notify_user_info_add_pair_plaintext(user_info, _("Status"), status); g_free(status); - g_free(escaped); } if (presence != NULL) - purple_notify_user_info_add_pair(user_info, _("Presence"), presence); + purple_notify_user_info_add_pair_plaintext(user_info, _("Presence"), presence); if (f && full) { YahooPersonalDetails *ypd = &f->ypd;