# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1232426302 0
# Node ID a06483567e32b28adfdd0c6facf1fb3c84054db6
# Parent  114e66c2fa7eec3887ce832c22ca73192abeaffd# Parent  8972d3cd4b42633cd2365cbbbd7ea366adb4f444
merge of '8c4498cf31a819963d4ee74d433f2ed267d65b51'
     and '96332a79fabc2ea2be0d2cf3fbaa4ea779f0eb02'

diff -r 114e66c2fa7e -r a06483567e32 COPYRIGHT
--- a/COPYRIGHT	Tue Jan 20 04:31:14 2009 +0000
+++ b/COPYRIGHT	Tue Jan 20 04:38:22 2009 +0000
@@ -63,6 +63,7 @@
 Damien Carbery
 Michael Carlson
 Keegan Carruthers-Smith
+Ludovico Cavedon
 Steve Cavilia
 Julien Cegarra
 Cerulean Studios, LLC
@@ -229,6 +230,7 @@
 Steve Láposi
 Daniel Larsson
 Peter Lawler
+Vadim Lebedev
 Ho-seok Lee
 Jean-Yves Lefort
 Moses Lei
diff -r 114e66c2fa7e -r a06483567e32 libpurple/prefs.c
--- a/libpurple/prefs.c	Tue Jan 20 04:31:14 2009 +0000
+++ b/libpurple/prefs.c	Tue Jan 20 04:38:22 2009 +0000
@@ -693,12 +693,15 @@
 	char *name;
 	GSList *l;
 
-	if(!pref || pref == &prefs)
+	if(!pref)
 		return;
 
 	while(pref->first_child)
 		remove_pref(pref->first_child);
 
+	if(pref == &prefs)
+		return;
+
 	if(pref->parent->first_child == pref) {
 		pref->parent->first_child = pref->sibling;
 	} else {
@@ -1453,4 +1456,8 @@
 
 
 	prefs_loaded = FALSE;
+	purple_prefs_destroy();
+	g_hash_table_destroy(prefs_hash);
+	prefs_hash = NULL;
+
 }