changeset 18615:0ad0bdb0063b

merge of '36ee98cd262baf7d57502c08fc185518ed93532a' and '4155ac2acf86fd3365a2f8ea18bd1cb4d1db4f0e'
author Ka-Hing Cheung <khc@hxbc.us>
date Sun, 22 Jul 2007 18:17:26 +0000
parents 823946ddd527 (diff) 784f98a1bc7f (current diff)
children c3c610e73fc0 0cb46c94c47d 2a2cc0b57d8f
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/finch/gntblist.c	Sun Jul 22 08:54:12 2007 +0000
+++ b/finch/gntblist.c	Sun Jul 22 18:17:26 2007 +0000
@@ -98,7 +98,7 @@
 	} u;
 } StatusBoxItem;
 
-FinchBlist *ggblist;
+static FinchBlist *ggblist;
 
 static void add_buddy(PurpleBuddy *buddy, FinchBlist *ggblist);
 static void add_contact(PurpleContact *contact, FinchBlist *ggblist);
@@ -1670,7 +1670,7 @@
 	}
 
 	/* Now the popular statuses */
-	for (iter = purple_savedstatuses_get_popular(6); iter; iter = iter->next)
+	for (iter = purple_savedstatuses_get_popular(6); iter; iter = g_list_delete_link(iter, iter))
 	{
 		item = g_new0(StatusBoxItem, 1);
 		item->type = STATUS_SAVED_POPULAR;