[gaim-migrate @ 9418]

Thu, 15 Apr 2004 02:23:28 +0000

author
Mark Doliner <markdoliner@pidgin.im>
date
Thu, 15 Apr 2004 02:23:28 +0000
changeset 8666
582a118d6b91
parent 8665
03013bac18b9
child 8667
534bd4c4fb38

[gaim-migrate @ 9418]
The comment should be pretty clear, I hope?
Basically HTML over ICQ should be getting escaped again.

src/protocols/oscar/oscar.c file | annotate | diff | comparison | revisions
--- a/src/protocols/oscar/oscar.c	Thu Apr 15 01:20:15 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Apr 15 02:23:28 2004 +0000
@@ -2358,10 +2358,15 @@
 		}
 	}
 
-	/* If the message came from an ICQ user then escape any HTML */
+	/*
+	 * If the message came from an ICQ user then escape any HTML, because
+	 * HTML should not be sent over ICQ as a means to format a message.
+	 * SIM is the only client we know of that sends HTML, everything else
+	 * (ie. official clients) use RTF.  Please let us know if this is
+	 * incorrect.
+	 */
 	if (isdigit(userinfo->sn[0])) {
-		gchar *tmp2;
-		gaim_markup_html_to_xhtml(tmp, &tmp2, NULL);
+		gchar *tmp2 = gaim_escape_html(tmp);
 		g_free(tmp);
 		tmp = tmp2;
 	}

mercurial