# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1185128246 0
# Node ID 0ad0bdb0063b766bf47d67aab1e2e9cbbd4ca8c1
# Parent  823946ddd52743837950768ed3d6301455051df4# Parent  784f98a1bc7f6ea605e61294353c7beee1151b9a
merge of '36ee98cd262baf7d57502c08fc185518ed93532a'
     and '4155ac2acf86fd3365a2f8ea18bd1cb4d1db4f0e'

diff -r 784f98a1bc7f -r 0ad0bdb0063b finch/gntblist.c
--- 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;
diff -r 784f98a1bc7f -r 0ad0bdb0063b libpurple/dbus-useful.c
diff -r 784f98a1bc7f -r 0ad0bdb0063b libpurple/debug.c
diff -r 784f98a1bc7f -r 0ad0bdb0063b libpurple/plugins/perl/common/Connection.xs
diff -r 784f98a1bc7f -r 0ad0bdb0063b libpurple/protocols/gg/lib/http.c
diff -r 784f98a1bc7f -r 0ad0bdb0063b libpurple/protocols/gg/lib/pubdir50.c
diff -r 784f98a1bc7f -r 0ad0bdb0063b libpurple/protocols/jabber/jutil.c
diff -r 784f98a1bc7f -r 0ad0bdb0063b libpurple/protocols/yahoo/yahoochat.h
diff -r 784f98a1bc7f -r 0ad0bdb0063b pidgin/gtkdocklet.c
diff -r 784f98a1bc7f -r 0ad0bdb0063b pidgin/gtklog.c
diff -r 784f98a1bc7f -r 0ad0bdb0063b pidgin/plugins/gestures/gestures.c
diff -r 784f98a1bc7f -r 0ad0bdb0063b pidgin/plugins/notify.c
diff -r 784f98a1bc7f -r 0ad0bdb0063b pidgin/plugins/timestamp.c