Mercurial > pidgin
changeset 28922:45fce067c690
merge of 'dc8e146830c1b3fa49695fd76eba4bc811e7ec53'
and 'e25f1563b3f1c8aebda882c2a86d2e32bac91732'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Fri, 29 Jan 2010 01:41:16 +0000 |
| parents | 5ffedd1578f0 (diff) 2930170ca3c0 (current diff) |
| children | fff8cf8459c4 |
| files | |
| diffstat | 3 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Thu Jan 28 21:44:16 2010 +0000 +++ b/COPYRIGHT Fri Jan 29 01:41:16 2010 +0000 @@ -147,6 +147,7 @@ Marc Etcheverry David Everly Larry Ewing +Fartash Faghri Gábor Farkas Jesse Farmer Gavan Fantom (gavan)
--- a/ChangeLog Thu Jan 28 21:44:16 2010 +0000 +++ b/ChangeLog Fri Jan 29 01:41:16 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)
--- a/libpurple/protocols/yahoo/util.c Thu Jan 28 21:44:16 2010 +0000 +++ b/libpurple/protocols/yahoo/util.c Fri Jan 29 01:41:16 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);