diff libgaim/savedstatuses.c @ 14747:091b6ce6372e

[gaim-migrate @ 17504] Don't exclude the current popular status from the popular statuses list. Also, fix selecting a saved status that doesn't apply to the token status account. committer: Tailor Script <tailor@pidgin.im>
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 18 Oct 2006 00:54:57 +0000
parents 587268c9c6d7
children c3a7d40d64bb
line wrap: on
line diff
--- a/libgaim/savedstatuses.c	Tue Oct 17 21:47:48 2006 +0000
+++ b/libgaim/savedstatuses.c	Wed Oct 18 00:54:57 2006 +0000
@@ -700,10 +700,7 @@
 	GList *popular = NULL;
 	GList *cur;
 	int i;
-	GaimSavedStatus *current, *next;
-
-	/* We don't want the current status to be in the GList */
-	current = gaim_savedstatus_get_current();
+	GaimSavedStatus *next;
 
 	/* Copy 'how_many' elements to a new list */
 	i = 0;
@@ -711,7 +708,7 @@
 	while ((i < how_many) && (cur != NULL))
 	{
 		next = cur->data;
-		if ((next != current) && (!gaim_savedstatus_is_transient(next)
+		if ((!gaim_savedstatus_is_transient(next)
 			|| gaim_savedstatus_get_message(next) != NULL))
 		{
 			popular = g_list_prepend(popular, cur->data);