summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Doliner <markdoliner@pidgin.im>2010-05-31 18:14:40 +0000
committerMark Doliner <markdoliner@pidgin.im>2010-05-31 18:14:40 +0000
commitaf1c6165742f1a03ed7d3dd5239cda79c7063064 (patch)
treee5dd8f59b7082059297d772a7ef005b3b5f10601
parentb6a8c46f0de836599928abd61db07ab93e895858 (diff)
downloadpidgin-af1c6165742f1a03ed7d3dd5239cda79c7063064.tar.gz
Copy the third hunk from 74fec67cd7b9f498cba0dcaeaefc14f914d78007 to trunk
Somehow this didn't get propagated in fd7ef5c29d177584937bb7283ee8815b847e70c4 So recent official ICQ clients display our HTML tags :-( Refs #11863
-rw-r--r--libpurple/protocols/oscar/oscar.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 33eeecdd39..e085198d6a 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -4651,7 +4651,8 @@ oscar_send_im(PurpleConnection *gc, const char *name, const char *message, Purpl
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);