Mercurial > pidgin
changeset 25294:a7b248333977
merge of '3bdf5aad1c3d02b04ea918d996f6db99ecb40778'
and 'd61c2fc82b19cd2629b498d903d7018d41a00108'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 09 Jan 2009 03:57:07 +0000 |
| parents | d5ab2f9485f2 (current diff) 1563f269a714 (diff) |
| children | 3e39e4652c36 |
| files | libpurple/prefs.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/core.c Fri Jan 09 03:56:09 2009 +0000 +++ b/libpurple/core.c Fri Jan 09 03:57:07 2009 +0000 @@ -137,7 +137,7 @@ * subsystem right away too. */ purple_plugins_init(); - + /* Initialize all static protocols. */ static_proto_init(); @@ -213,6 +213,7 @@ purple_accounts_uninit(); purple_savedstatuses_uninit(); purple_status_uninit(); + purple_prefs_uninit(); purple_sound_uninit(); purple_xfers_uninit(); purple_proxy_uninit(); @@ -243,7 +244,6 @@ #ifdef _WIN32 wpurple_cleanup(); #endif - purple_prefs_uninit(); _core = NULL; }
--- a/libpurple/prefs.c Fri Jan 09 03:56:09 2009 +0000 +++ b/libpurple/prefs.c Fri Jan 09 03:57:07 2009 +0000 @@ -711,8 +711,7 @@ name = pref_full_name(pref); - if (prefs_loaded) - purple_debug_info("prefs", "removing pref %s\n", name); + purple_debug_info("prefs", "removing pref %s\n", name); g_hash_table_remove(prefs_hash, name); g_free(name); @@ -1452,5 +1451,6 @@ sync_prefs(); } + prefs_loaded = FALSE; }