Mercurial > pidgin.yaz

changeset 21837:5c702ff46072

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of '4268f3923b30680b7ec013f553a7733f4b24417d' and 'a35fdd1f166003bb0d08537b715693c1786fe180'
author Will Thompson <will.thompson@collabora.co.uk>
date Sun, 16 Dec 2007 16:37:53 +0000
parents 543306932d15 (diff) e552f16abc88 (current diff)
children a9347b5101a9
files
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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]);
 			}