/soc/2013/ankitkv/gobjectification: f3bf09e2e4cf: Merged soc.201...

[Ankit Vani]

Changeset: f3bf09e2e4cffcab7da342e33fd7fba6637256f4
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-10-12 18:11 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/f3bf09e2e4cf

Description:

Merged soc.2013.gobjectification branch

diffstat:

 libpurple/status.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (19 lines):

diff --git a/libpurple/status.c b/libpurple/status.c
--- a/libpurple/status.c
+++ b/libpurple/status.c
@@ -590,11 +590,12 @@ status_has_changed(PurpleStatus *status)
 	if (purple_status_is_exclusive(status))
 	{
 		old_status = purple_presence_get_active_status(presence);
-		if (old_status != NULL && (old_status != status))
+		if (old_status != NULL && (old_status != status)) {
 			PURPLE_STATUS_GET_PRIVATE(old_status)->active = FALSE;
+			g_object_notify(G_OBJECT(old_status), "active");
+		}
+
 		g_object_set(presence, "active-status", status, NULL);
-
-		g_object_notify(G_OBJECT(old_status), "active");
 		g_object_notify(G_OBJECT(status), "active");
 	}
 	else