pidgin: e8c67927: Fix unsetting your mood when "None" is s...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: e8c67927e3d1262c3ab078202110ed3ffb5f09a1
Parent:   1d8c66554592a72be061dfb7c66937c38028d70b
Author:   markdoliner at pidgin.im
Date:     03/21/11 03:38:06
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e8c67927e3d1262c3ab078202110ed3ffb5f09a1

Changelog: 

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.

Changes against parent 1d8c66554592a72be061dfb7c66937c38028d70b

  patched  ChangeLog
  patched  libpurple/protocols/oscar/oscar.c

-------------- next part --------------
============================================================
--- ChangeLog	beb2ac03a756f0330fb57ff6887c79e1a1e42a8a
+++ ChangeLog	afd18e29cf15b04badf81aacab417a11cc27df5e
@@ -19,6 +19,9 @@ version 2.8.0 (??/??/????):
 	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)
============================================================
--- libpurple/protocols/oscar/oscar.c	fc577a8df13369348e0d2ea675ed061453219ac7
+++ libpurple/protocols/oscar/oscar.c	0fb1978f0d98ba2ace94809dc2b99c7200f255c4
@@ -3660,7 +3660,9 @@ oscar_set_status(PurpleAccount *account,
 
 	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))