changeset
merge of 'dca57fda6b15529a1bcfe252207afda2e5853c86'
Sun, 22 Jul 2007 00:59:51 +0000
- author
- Ka-Hing Cheung <khc@pidgin.im>
- date
- Sun, 22 Jul 2007 00:59:51 +0000
- changeset 18866
- e95e6e795aaa
- parent 18864
- dca57fda6b15 (diff)
- parent 18861
- cdbebb5a39c3 (current diff)
- child 18867
- ccdc920ec008
- child 18871
- 078df6ae587a
- child 19306
- 99adc2a159d5
merge of 'dca57fda6b15529a1bcfe252207afda2e5853c86'
and 'cdbebb5a39c317f1b88ebbb765774f723497e761'
--- 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.",
