pidgin: 59dabca5: Fixes from the QuteCom folks for the cor...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 59dabca54f8fec54f44c38eaaaafb29086c7ade7
Ancestor: 960cd18dc3e93e7cd7fa1c03ac22804ae128a9c3
Author: datallah at pidgin.im
Date: 2009-01-01T23:07:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/59dabca54f8fec54f44c38eaaaafb29086c7ade7

Modified files:
        COPYRIGHT libpurple/prefs.c

ChangeLog: 

Fixes from the QuteCom folks for the core being reinitialized. References #7761

-------------- next part --------------
============================================================
--- COPYRIGHT	b6894a8ad604a63a15f7d9e2321256dbf009aaf3
+++ COPYRIGHT	a2f89431bbad26dad7c08069947f03285051ea8b
@@ -63,6 +63,7 @@ Keegan Carruthers-Smith
 Damien Carbery
 Michael Carlson
 Keegan Carruthers-Smith
+Ludovico Cavedon
 Steve Cavilia
 Julien Cegarra
 Cerulean Studios, LLC
@@ -228,6 +229,7 @@ Peter Lawler
 Steve L?posi
 Daniel Larsson
 Peter Lawler
+Vadim Lebedev
 Ho-seok Lee
 Jean-Yves Lefort
 Moses Lei
============================================================
--- libpurple/prefs.c	2bd46b2a30301e415080e98ca0813412288b1a43
+++ libpurple/prefs.c	155bb1ed1363d3d72bfc07cb890818a4cdb90e3d
@@ -693,12 +693,15 @@ remove_pref(struct purple_pref *pref)
 	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_uninit()
 	}
 
 	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
+	purple_prefs_destroy();
+	g_hash_table_destroy(prefs_hash);
+	prefs_hash = NULL;
+
 }