Mercurial > pidgin.yaz

diff src/status.c @ 10052:eaec201b2688

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 11013] More rockin status stuff from Dave West! Things are beginning to shape up quite well. Dave, again, sorry it took me a week to get to this. Girl waits for no man. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 19 Sep 2004 21:19:55 +0000
parents 81059dce3aed
children b566449d45f8
line wrap: on
line diff
--- a/src/status.c	Sun Sep 19 21:14:28 2004 +0000
+++ b/src/status.c	Sun Sep 19 21:19:55 2004 +0000
@@ -621,7 +621,7 @@
 
 	if (!active && !gaim_status_type_is_independent(status_type))
 	{
-		gaim_debug(GAIM_DEBUG_ERROR, "status",
+		gaim_debug_error("status",
 				   "Cannot deactivate an exclusive status (%s).\n",
 				   gaim_status_type_get_id(status_type));
 		return;
@@ -1099,13 +1099,13 @@
 			return;
 		}
 
-		if (presence->active_status != NULL)
-			gaim_status_set_active(presence->active_status, FALSE);
+	} else if (presence->active_status != NULL) {
+		gaim_status_set_active(presence->active_status, FALSE);
 
-		presence->active_status = status;
 	}
 
 	gaim_status_set_active(status, active);
+	presence->active_status = status;
 }
 
 void