# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1250965853 0
# Node ID 7115d04c525a616fa8a708557e1840074b7d106f
# Parent  faf98a4b27d807abf6cff8435333fb6c2dc9fb51# Parent  1d2425f2e4ff0cb5ffc761c74459128073530375
merge of '2b68579960365fea9a55bc39baf90eb59c42f972'
     and '3ce9883eaf090e4ec49d632e99ae336882b209cd'

diff -r faf98a4b27d8 -r 7115d04c525a libpurple/protocols/yahoo/util.c
--- a/libpurple/protocols/yahoo/util.c	Sat Aug 22 18:29:44 2009 +0000
+++ b/libpurple/protocols/yahoo/util.c	Sat Aug 22 18:30:53 2009 +0000
@@ -611,7 +611,6 @@
 				if (match == NULL) {
 					/* Unknown tag.  The user probably typed a less-than sign */
 					g_string_append_c(cdata, x[i]);
-					no_more_gt_brackets = TRUE;
 					g_free(tag);
 					g_free(tag_name);
 					break;
diff -r faf98a4b27d8 -r 7115d04c525a libpurple/tests/test_yahoo_util.c
--- a/libpurple/tests/test_yahoo_util.c	Sat Aug 22 18:29:44 2009 +0000
+++ b/libpurple/tests/test_yahoo_util.c	Sat Aug 22 18:30:53 2009 +0000
@@ -100,6 +100,8 @@
 			yahoo_codes_to_html("<font face='Georgia' size='32'>test"));
 	assert_string_equal_free("<font color='#FF0080'><font size='4' absz='15'>test</font></font>",
 			yahoo_codes_to_html("\x1B[35m<font size='15'>test"));
+	assert_string_equal_free(":&lt;",
+			yahoo_codes_to_html("<FADE #ff0000,#00ff00,#0000ff>:<</FADE>"));
 #endif /* !USE_CSS_FORMATTING */
 }
 END_TEST
diff -r faf98a4b27d8 -r 7115d04c525a pidgin/plugins/Makefile.mingw
--- a/pidgin/plugins/Makefile.mingw	Sat Aug 22 18:29:44 2009 +0000
+++ b/pidgin/plugins/Makefile.mingw	Sat Aug 22 18:30:53 2009 +0000
@@ -91,7 +91,6 @@
 		spellchk.dll \
 		timestamp_format.dll \
 		timestamp.dll \
-		vvconfig.dll \
 		xmppconsole.dll
 
 ##