# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1177720777 0
# Node ID e87a490968bb7ad0181f81b12f576a32ec575af9
# Parent  ec8a3ca95a1376e3c6168e3a3ca3633f9832fa16# Parent  0cd684e34403516cbdf1f129136536df57175643
merge of '8038098094432fe9f6d324d1e4aadb8ff1f9e44a'
     and 'e752600f71cd86301f03b40c317898826c4ee34a'

diff -r ec8a3ca95a13 -r e87a490968bb libpurple/prefs.c
--- a/libpurple/prefs.c	Sat Apr 28 00:15:46 2007 +0000
+++ b/libpurple/prefs.c	Sat Apr 28 00:39:37 2007 +0000
@@ -1102,13 +1102,14 @@
 static void
 purple_prefs_rename_node(struct purple_pref *oldpref, struct purple_pref *newpref)
 {
-	struct purple_pref *child;
+	struct purple_pref *child, *next;
 	char *oldname, *newname;
 
 	/* if we're a parent, rename the kids first */
-	for(child = oldpref->first_child; child != NULL; child = child->sibling)
+	for(child = oldpref->first_child; child != NULL; child = next)
 	{
 		struct purple_pref *newchild;
+		next = child->sibling;
 		for(newchild = newpref->first_child; newchild != NULL; newchild = newchild->sibling)
 		{
 			if(!strcmp(child->name, newchild->name))
diff -r ec8a3ca95a13 -r e87a490968bb libpurple/util.c
--- a/libpurple/util.c	Sat Apr 28 00:15:46 2007 +0000
+++ b/libpurple/util.c	Sat Apr 28 00:39:37 2007 +0000
@@ -2696,6 +2696,7 @@
 purple_normalize(const PurpleAccount *account, const char *str)
 {
 	const char *ret = NULL;
+	static char buf[BUF_LEN];
 
 	if (account != NULL)
 	{
@@ -2712,7 +2713,6 @@
 
 	if (ret == NULL)
 	{
-		static char buf[BUF_LEN];
 		char *tmp;
 
 		tmp = g_utf8_normalize(str, -1, G_NORMALIZE_DEFAULT);