Index: src/status.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/status.c,v
retrieving revision 1.20
diff -u -p -r1.20 status.c
--- src/status.c	19 Sep 2004 21:19:55 -0000	1.20
+++ src/status.c	21 Sep 2004 00:49:25 -0000
@@ -636,20 +636,14 @@ gaim_status_set_active(GaimStatus *statu
 
 		for (l = gaim_presence_get_statuses(presence); l != NULL; l = l->next)
 		{
-			GaimStatusType *temp_type = l->data;
-			GaimStatus *temp_status = NULL;
+			GaimStatus *temp_status = l->data;
+			GaimStatusType *temp_type;
 
-			if  (!gaim_status_compare(temp_status, status))
-				continue;
+			temp_type = gaim_status_get_type(temp_status);
 
 			if (gaim_status_type_is_independent(temp_type))
 				continue;
 
-
-			temp_status = (GaimStatus *)g_hash_table_lookup(
-												presence->status_table,
-												gaim_status_type_get_id(temp_type));
-
 			if (gaim_status_is_active(temp_status))
 			{
 				/*