# HG changeset patch
# User Fartash Faghri
# Date 1264728638 0
# Node ID 5ffedd1578f0d8d44f74950a965f81b40fcf11ae
# Parent  48d2b6d1ab7470c46a57c2ee35f5b6f3609c0a35
Don't send <span>...</span> on Yahoo.  Fixes #11242, #10961.

committer: John Bailey <rekkanoryo@rekkanoryo.org>

diff -r 48d2b6d1ab74 -r 5ffedd1578f0 COPYRIGHT
--- a/COPYRIGHT	Thu Jan 28 17:44:28 2010 +0000
+++ b/COPYRIGHT	Fri Jan 29 01:30:38 2010 +0000
@@ -147,6 +147,7 @@
 Marc Etcheverry
 David Everly
 Larry Ewing
+Fartash Faghri
 Gábor Farkas
 Jesse Farmer
 Gavan Fantom (gavan)
diff -r 48d2b6d1ab74 -r 5ffedd1578f0 ChangeLog
--- a/ChangeLog	Thu Jan 28 17:44:28 2010 +0000
+++ b/ChangeLog	Fri Jan 29 01:30:38 2010 +0000
@@ -32,6 +32,9 @@
 	* Wrap XHTML messages in <p>, as described in XEP-0071, for compatibility
 	  with some clients.
 
+	Yahoo:
+	* Don't send <span> and </span> tags.  (Fartash Faghri)
+
 	Pidgin:
 	* Correctly size conversation and status box entries when the
 	  interior-focus style property is diabled. (Gabriel Schulhof)
diff -r 48d2b6d1ab74 -r 5ffedd1578f0 libpurple/protocols/yahoo/util.c
--- a/libpurple/protocols/yahoo/util.c	Thu Jan 28 17:44:28 2010 +0000
+++ b/libpurple/protocols/yahoo/util.c	Fri Jan 29 01:30:38 2010 +0000
@@ -884,6 +884,8 @@
 						}
 						g_free(etag);
 					}
+				} else if (g_str_equal(tag_name, "span") || g_str_equal(tag_name, "/span")) {
+					/* Do nothing */
 				} else {
 					/* We don't know what the tag is. Send it unmodified. */
 					g_string_append(dest, tag);