# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1231473369 0
# Node ID d5ab2f9485f2b8c3631eba59404523f0a4cffc33
# Parent  fa055be807bf758441eaa64621310742734aaf1c# Parent  fdcb21cd65653bda71cb9d2b53dd76bd62114546
merge of '9d07d82a935ade0bf3a9a387a0c8998d552c7be9'
     and 'dd58d6e08f6bf88e8bdd13e3c8d0b73cc73bbab3'

diff -r fa055be807bf -r d5ab2f9485f2 COPYRIGHT
--- a/COPYRIGHT	Fri Jan 09 03:48:01 2009 +0000
+++ b/COPYRIGHT	Fri Jan 09 03:56:09 2009 +0000
@@ -63,7 +63,6 @@
 Damien Carbery
 Michael Carlson
 Keegan Carruthers-Smith
-Ludovico Cavedon
 Steve Cavilia
 Julien Cegarra
 Cerulean Studios, LLC
@@ -230,7 +229,6 @@
 Steve Láposi
 Daniel Larsson
 Peter Lawler
-Vadim Lebedev
 Ho-seok Lee
 Jean-Yves Lefort
 Moses Lei
diff -r fa055be807bf -r d5ab2f9485f2 libpurple/prefs.c
--- a/libpurple/prefs.c	Fri Jan 09 03:48:01 2009 +0000
+++ b/libpurple/prefs.c	Fri Jan 09 03:56:09 2009 +0000
@@ -693,15 +693,12 @@
 	char *name;
 	GSList *l;
 
-	if(!pref)
+	if(!pref || pref == &prefs)
 		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 {
@@ -1456,8 +1453,4 @@
 	}
 
 	prefs_loaded = FALSE;
-	purple_prefs_destroy();
-	g_hash_table_destroy(prefs_hash);
-	prefs_hash = NULL;
-
 }