pidgin: 913a8d73: Copy the third hunk from 3c30f64efedafc3...

Mon May 31 14:20:46 EDT 2010

-----------------------------------------------------------------
Revision: 913a8d73fc8635dab66f0c26561d1ec9fe366b09
Ancestor: 400711883eb863ad003b708b910f4f0254797ffa
Author: markdoliner at pidgin.im
Date: 2010-05-31T18:14:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/913a8d73fc8635dab66f0c26561d1ec9fe366b09

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

Copy the third hunk from 3c30f64efedafc379b6536852bbb3b6ef5f1f6c9 to trunk
Somehow this didn't get propagated in bcae499af351044e047d297b8032fa4dca99c147
So recent official ICQ clients display our HTML tags :-(
Refs #11863

-------------- next part --------------
============================================================

--- libpurple/protocols/oscar/oscar.c	b448ff8a14ab7db9b3ad6ce2c8f17cac8159f702
+++ libpurple/protocols/oscar/oscar.c	6b8b45623896204448ac4b212a0c631655822ad1
@@ -4651,7 +4651,8 @@ oscar_send_im(PurpleConnection *gc, cons
 			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);
