Mercurial > pidgin.yaz
changeset 18599:4efd240ffaa0
merge of '21c2a204378d0369b8d2b6d7b32b6da45cb1ddb2'
and 'a55d49d8370e0e949cd461b528bc84ac435e93e9'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Sun, 22 Jul 2007 00:59:51 +0000 |
| parents | c7a5cd17b045 (diff) 8261beed9653 (current diff) |
| children | 321658bf0e03 1ee45aedab07 3ac99b2e2168 |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/oscar.c Sun Jul 22 00:25:56 2007 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sun Jul 22 00:59:51 2007 +0000 @@ -4328,10 +4328,15 @@ tmp2 = purple_markup_strip_html(tmp1); g_free(tmp1); - - tmp1 = purple_strdup_withhtml(tmp2); + + /* re-escape the entities */ + tmp1 = g_markup_escape_text(tmp2, -1); g_free(tmp2); + tmp2 = purple_strdup_withhtml(tmp1); + g_free(tmp1); + tmp1 = tmp2; + purple_plugin_oscar_convert_to_best_encoding(gc, name, tmp1, (char **)&args.msg, &args.msglen, &args.charset, &args.charsubset); purple_debug_info("oscar", "Sending %s as %s because the original was too long.",