# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1232426243 0
# Node ID 8972d3cd4b42633cd2365cbbbd7ea366adb4f444
# Parent  fdcb21cd65653bda71cb9d2b53dd76bd62114546
disapproval of revision 'dd58d6e08f6bf88e8bdd13e3c8d0b73cc73bbab3'

Re-enable the prefs unint changes. Refs #7661.

diff -r fdcb21cd6565 -r 8972d3cd4b42 COPYRIGHT
--- a/COPYRIGHT	Fri Jan 09 03:55:52 2009 +0000
+++ b/COPYRIGHT	Tue Jan 20 04:37:23 2009 +0000
@@ -63,6 +63,7 @@
 Damien Carbery
 Michael Carlson
 Keegan Carruthers-Smith
+Ludovico Cavedon
 Steve Cavilia
 Julien Cegarra
 Cerulean Studios, LLC
@@ -228,6 +229,7 @@
 Steve Láposi
 Daniel Larsson
 Peter Lawler
+Vadim Lebedev
 Ho-seok Lee
 Jean-Yves Lefort
 Moses Lei
diff -r fdcb21cd6565 -r 8972d3cd4b42 libpurple/prefs.c
--- a/libpurple/prefs.c	Fri Jan 09 03:55:52 2009 +0000
+++ b/libpurple/prefs.c	Tue Jan 20 04:37:23 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 {
@@ -1452,4 +1455,8 @@
 	}
 
 	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
+	purple_prefs_destroy();
+	g_hash_table_destroy(prefs_hash);
+	prefs_hash = NULL;
+
 }