# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1254844685 0
# Node ID 42fc2fc14db22c66db49354ca298c803817de032
# Parent  43200ff042ad681eda8d8d07ee6cf8173721dae2# Parent  51ba542e05ebadc07f0c06c2a7547b5d70529bf7
merge of '071f90416f664b41b4426e7929dc0a595aa02127'
     and 'cc9474cafa24a034b6f09ddf020062a8de40e1e8'

diff -r 51ba542e05eb -r 42fc2fc14db2 ChangeLog
--- a/ChangeLog	Tue Oct 06 03:34:05 2009 +0000
+++ b/ChangeLog	Tue Oct 06 15:58:05 2009 +0000
@@ -7,6 +7,9 @@
 	  is specified.
 	* Fix a crash when adding a buddy without an '@'.
 
+	Yahoo:
+	* Fix sending /buzz.
+
 	General:
 	* New 'plugins' sub-command to 'debug' command (i.e. '/debug plugins')
 	  to announce the list of loaded plugins (in both Finch and Pidgin).
diff -r 51ba542e05eb -r 42fc2fc14db2 libpurple/protocols/yahoo/util.c
--- a/libpurple/protocols/yahoo/util.c	Tue Oct 06 03:34:05 2009 +0000
+++ b/libpurple/protocols/yahoo/util.c	Tue Oct 06 15:58:05 2009 +0000
@@ -881,6 +881,9 @@
 						}
 						g_free(etag);
 					}
+				} else {
+					/* We don't know what the tag is. Send it unmodified. */
+					g_string_append(dest, tag);
 				}
 
 				i = j;
diff -r 51ba542e05eb -r 42fc2fc14db2 libpurple/tests/test_yahoo_util.c
--- a/libpurple/tests/test_yahoo_util.c	Tue Oct 06 03:34:05 2009 +0000
+++ b/libpurple/tests/test_yahoo_util.c	Tue Oct 06 15:58:05 2009 +0000
@@ -180,6 +180,12 @@
 
 	assert_string_equal_free("\x1B[1mbold \x1B[#FF0000mred <font face=\"Comic Sans MS\" size=\"20\">larger \x1B[#000000mbacktoblack <font size=\"12\">normalsize</font>\x1B[#FF0000m</font>\x1B[#000000m\x1B[x1m",
 			yahoo_html_to_codes("<b>bold <font color=\"#FF0000\">red <font face=\"Comic Sans MS\" size=\"5\">larger <font color=\"#000000\">backtoblack <font size=\"3\">normalsize</font></font></font></font></b>"));
+
+	/* buzz/unknown tags */
+	assert_string_equal_free("<ding>",
+			yahoo_html_to_codes("<ding>"));
+	assert_string_equal_free("Unknown <tags>",
+			yahoo_html_to_codes("Unknown <tags>"));
 }
 END_TEST