Mercurial > pidgin
changeset 31407:c446bf0b83d2
Fix unsetting your mood when "None" is selected. (#7431)
I have no way to test this because the official ICQ client doesn't
support moods anymore.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 21 Mar 2011 07:38:06 +0000 |
| parents | 0062b2661b3c |
| children | 826b595c4259 |
| files | ChangeLog libpurple/protocols/oscar/oscar.c |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Mar 21 07:27:33 2011 +0000 +++ b/ChangeLog Mon Mar 21 07:38:06 2011 +0000 @@ -19,6 +19,9 @@ Gadu-Gadu: * Allow showing your status only to buddies. (Mateusz Piękos) (#13358) + ICQ: + * Fix unsetting your mood when "None" is selected. (#7431) + Windows-Specific Changes: * Fix building libpurple with Visual C++ .NET 2005. This was accidentally broken in 2.7.11. (Florian Quèze)
--- a/libpurple/protocols/oscar/oscar.c Mon Mar 21 07:27:33 2011 +0000 +++ b/libpurple/protocols/oscar/oscar.c Mon Mar 21 07:38:06 2011 +0000 @@ -3660,7 +3660,9 @@ purple_debug_info("oscar", "Set status to %s\n", purple_status_get_name(status)); - if (!purple_status_is_active(status)) + /* Either setting a new status active or setting a status inactive. + * (Only possible for independent status (i.e. X-Status moods.) */ + if (!purple_status_is_active(status) && !purple_status_is_independent(status)) return; if (!purple_account_is_connected(account))