# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1086913393 0
# Node ID cea7eba5f49438a4cb7c8e34e368936e73b2f3f8
# Parent  70153c75901631ad346878fa31296e6ece8dea52
[gaim-migrate @ 10063]
Patch by Stu Tomlinson (#959490) to handle &nbsp;, &apos; and HTML entities
in msn_import_html() and to prevent an infinite loop when encountering
unknown entities.

committer: Tailor Script <tailor@pidgin.im>

diff -r 70153c759016 -r cea7eba5f494 src/protocols/msn/utils.c
--- a/src/protocols/msn/utils.c	Fri Jun 11 00:18:36 2004 +0000
+++ b/src/protocols/msn/utils.c	Fri Jun 11 00:23:13 2004 +0000
@@ -290,6 +290,11 @@
 				msg[retcount++] = '>';
 				c += 4;
 			}
+			else if (!g_ascii_strncasecmp(c, "&nbsp;", 6))
+			{
+				msg[retcount++] = ' ';
+				c += 6;
+			}
 			else if (!g_ascii_strncasecmp(c, "&quot;", 6))
 			{
 				msg[retcount++] = '"';
@@ -300,6 +305,13 @@
 				msg[retcount++] = '&';
 				c += 5;
 			}
+			else if (!g_ascii_strncasecmp(c, "&apos;", 6))
+			{
+				msg[retcount++] = '\'';
+				c += 6;
+			}
+			else
+				msg[retcount++] = *c++;
 		}
 		else
 			msg[retcount++] = *c++;