# HG changeset patch
# User Will Thompson <will.thompson@collabora.co.uk>
# Date 1197823073 0
# Node ID 5c702ff46072b5cebdc73f84c074416797a106d9
# Parent  543306932d153b0426a11ea4c8cbb842ea4f0f7d# Parent  e552f16abc8840b30e6c9edabf4a9a4b669f973b
merge of '4268f3923b30680b7ec013f553a7733f4b24417d'
     and 'a35fdd1f166003bb0d08537b715693c1786fe180'

diff -r e552f16abc88 -r 5c702ff46072 autogen.sh
diff -r e552f16abc88 -r 5c702ff46072 libpurple/protocols/yahoo/util.c
--- a/libpurple/protocols/yahoo/util.c	Sun Dec 16 00:36:02 2007 +0000
+++ b/libpurple/protocols/yahoo/util.c	Sun Dec 16 16:37:53 2007 +0000
@@ -715,12 +715,15 @@
 			} else if (((len - i) >= 4) && !strncmp(&src[i], "&gt;", 4)) {
 				g_string_append_c(dest, '>');
 				i += 3;
-			} else if (((len - i) >= 5) && !strncmp(&src[i], "&amp;", 4)) {
+			} else if (((len - i) >= 5) && !strncmp(&src[i], "&amp;", 5)) {
 				g_string_append_c(dest, '&');
 				i += 4;
-			} else if (((len - i) >= 6) && !strncmp(&src[i], "&quot;", 4)) {
+			} else if (((len - i) >= 6) && !strncmp(&src[i], "&quot;", 6)) {
 				g_string_append_c(dest, '"');
 				i += 5;
+			} else if (((len - i) >= 6) && !strncmp(&src[i], "&apos;", 6)) {
+				g_string_append_c(dest, '\'');
+				i += 5;
 			} else {
 				g_string_append_c(dest, src[i]);
 			}