changeset 24928:fdcb21cd6565

disapproval of revision '59dabca54f8fec54f44c38eaaaafb29086c7ade7' Disable the prefs unint changes for now because they are problematic. Refs #7761.
author Daniel Atallah <daniel.atallah@gmail.com>
date Fri, 09 Jan 2009 03:55:52 +0000
parents 8b55fcc6adde
children d5ab2f9485f2 8972d3cd4b42
files COPYRIGHT libpurple/prefs.c
diffstat 2 files changed, 1 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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;
-
 }