diff options
| author | Daniel Atallah <datallah@pidgin.im> | 2009-01-20 04:37:23 +0000 |
|---|---|---|
| committer | Daniel Atallah <datallah@pidgin.im> | 2009-01-20 04:37:23 +0000 |
| commit | 716f5f17e9022accf4362a0c7c30a56734e588ce (patch) | |
| tree | a34ff61355b58788f6ea2a263f11cf11dda54a24 /libpurple/prefs.c | |
| parent | b606a015e2a49da6b3c8fc042fd556f0c8542ae4 (diff) | |
| download | pidgin-716f5f17e9022accf4362a0c7c30a56734e588ce.tar.gz | |
disapproval of revision '44c0c2db82ae6d24ea6cfc6dad26442d371f5baf'
Re-enable the prefs unint changes. Refs #7661.
Diffstat (limited to 'libpurple/prefs.c')
| -rw-r--r-- | libpurple/prefs.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libpurple/prefs.c b/libpurple/prefs.c index 139e96d093..960ecb0191 100644 --- a/libpurple/prefs.c +++ b/libpurple/prefs.c @@ -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; + } |