Merged soc.2013.gobjectification branch soc.2013.gobjectification.plugins

Sat, 12 Oct 2013 18:11:22 +0530

author
Ankit Vani <a@nevitus.org>
date
Sat, 12 Oct 2013 18:11:22 +0530
branch
soc.2013.gobjectification.plugins
changeset 36891
f3bf09e2e4cf
parent 36890
fa13e99f8248 (current diff)
parent 35018
16313df69717 (diff)
child 36892
577b7e80f015

Merged soc.2013.gobjectification branch

libpurple/status.c file | annotate | diff | comparison | revisions
--- a/libpurple/status.c	Sat Oct 12 17:53:05 2013 +0530
+++ b/libpurple/status.c	Sat Oct 12 18:11:22 2013 +0530
@@ -590,11 +590,12 @@
 	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

mercurial