Mercurial > pidgin
changeset 30355:053776c347c8
propagate from branch 'im.pidgin.pidgin' (head 6259f2ab71027fb5030213c7adb95cb367f35642)
to branch 'im.pidgin.soc.2010.icq-tlc' (head 6f5f6937f71fdbcf6ffbf3f9f32ed191571c513f)
| author | ivan.komarov@soc.pidgin.im |
|---|---|
| date | Thu, 20 May 2010 13:51:24 +0000 |
| parents | 8995c173d010 (current diff) a327c6a1d5ca (diff) |
| children | 0d5dab71be7a |
| files | libpurple/protocols/oscar/oscar.c pidgin/win32/nsis/langmacros.nsh pidgin/win32/nsis/translations/afrikaans.nsh pidgin/win32/nsis/translations/albanian.nsh pidgin/win32/nsis/translations/arabic.nsh pidgin/win32/nsis/translations/basque.nsh pidgin/win32/nsis/translations/bulgarian.nsh pidgin/win32/nsis/translations/catalan.nsh pidgin/win32/nsis/translations/czech.nsh pidgin/win32/nsis/translations/danish.nsh pidgin/win32/nsis/translations/dutch.nsh pidgin/win32/nsis/translations/english.nsh pidgin/win32/nsis/translations/finnish.nsh pidgin/win32/nsis/translations/french.nsh pidgin/win32/nsis/translations/galician.nsh pidgin/win32/nsis/translations/german.nsh pidgin/win32/nsis/translations/hebrew.nsh pidgin/win32/nsis/translations/hungarian.nsh pidgin/win32/nsis/translations/italian.nsh pidgin/win32/nsis/translations/japanese.nsh pidgin/win32/nsis/translations/korean.nsh pidgin/win32/nsis/translations/kurdish.nsh pidgin/win32/nsis/translations/lithuanian.nsh pidgin/win32/nsis/translations/norwegian.nsh pidgin/win32/nsis/translations/norwegian_nynorsk.nsh pidgin/win32/nsis/translations/persian.nsh pidgin/win32/nsis/translations/polish.nsh pidgin/win32/nsis/translations/portuguese-br.nsh pidgin/win32/nsis/translations/portuguese.nsh pidgin/win32/nsis/translations/romanian.nsh pidgin/win32/nsis/translations/russian.nsh pidgin/win32/nsis/translations/serbian-latin.nsh pidgin/win32/nsis/translations/simp-chinese.nsh pidgin/win32/nsis/translations/slovak.nsh pidgin/win32/nsis/translations/slovenian.nsh pidgin/win32/nsis/translations/spanish.nsh pidgin/win32/nsis/translations/swedish.nsh pidgin/win32/nsis/translations/trad-chinese.nsh pidgin/win32/nsis/translations/valencian.nsh pidgin/win32/nsis/translations/vietnamese.nsh |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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("<HTML><BODY>%s</BODY></HTML>", tmp1); is_html = TRUE; } g_free(tmp1);