Mercurial > pidgin
changeset 25346:59ce16832872
merge of '346878a46ca5cbf1ddb7818cce123b5a936b803e'
and 'a26e2bf5b3aff4fa33851302ca5301b551e67b09'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Tue, 20 Jan 2009 04:39:54 +0000 |
| parents | a06483567e32 (current diff) cf8c060cdd25 (diff) |
| children | 7e2f27351358 |
| files | libpurple/core.c libpurple/prefs.c |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/core.c Tue Jan 20 04:38:22 2009 +0000 +++ b/libpurple/core.c Tue Jan 20 04:39:54 2009 +0000 @@ -137,7 +137,7 @@ * subsystem right away too. */ purple_plugins_init(); - + /* Initialize all static protocols. */ static_proto_init(); @@ -225,7 +225,6 @@ purple_accounts_uninit(); purple_savedstatuses_uninit(); purple_status_uninit(); - purple_prefs_uninit(); purple_sound_uninit(); purple_xfers_uninit(); purple_proxy_uninit(); @@ -252,6 +251,7 @@ #ifdef _WIN32 wpurple_cleanup(); #endif + purple_prefs_uninit(); _core = NULL; }
--- a/libpurple/prefs.c Tue Jan 20 04:38:22 2009 +0000 +++ b/libpurple/prefs.c Tue Jan 20 04:39:54 2009 +0000 @@ -714,7 +714,8 @@ name = pref_full_name(pref); - purple_debug_info("prefs", "removing pref %s\n", name); + if (prefs_loaded) + purple_debug_info("prefs", "removing pref %s\n", name); g_hash_table_remove(prefs_hash, name); g_free(name); @@ -1453,7 +1454,7 @@ save_timer = 0; sync_prefs(); } - + prefs_loaded = FALSE; prefs_loaded = FALSE; purple_prefs_destroy();