# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1231473352 0
# Node ID fdcb21cd65653bda71cb9d2b53dd76bd62114546
# Parent  8b55fcc6adde908e07197b328255c91813270d12
disapproval of revision '59dabca54f8fec54f44c38eaaaafb29086c7ade7'

Disable the prefs unint changes for now because they are problematic. Refs #7761.

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