# HG changeset patch # User ivan.komarov@soc.pidgin.im # Date 1274363484 0 # Node ID 053776c347c8128722fbbfff78b9b285cfbc4ded # Parent 8995c173d0102ac95f2fa1aba760dd5feb52e79b# Parent a327c6a1d5ca6a96ae54c3ab12ee21281d0a1d0d propagate from branch 'im.pidgin.pidgin' (head 6259f2ab71027fb5030213c7adb95cb367f35642) to branch 'im.pidgin.soc.2010.icq-tlc' (head 6f5f6937f71fdbcf6ffbf3f9f32ed191571c513f) diff -r 8995c173d010 -r 053776c347c8 libpurple/protocols/oscar/oscar.c --- a/libpurple/protocols/oscar/oscar.c Thu May 20 10:13:31 2010 +0000 +++ b/libpurple/protocols/oscar/oscar.c Thu May 20 13:51:24 2010 +0000 @@ -4651,7 +4651,8 @@ tmp2 = purple_markup_strip_html(tmp1); is_html = FALSE; } else { - tmp2 = g_strdup(tmp1); + /* ICQ 6 wants its HTML wrapped in these tags. Oblige it. */ + tmp2 = g_strdup_printf("%s", tmp1); is_html = TRUE; } g_free(tmp1);