# HG changeset patch
# User Daniel Atallah <datallah@pidgin.im>
# Date 1231473427 0
# Node ID 9be593758c72e33bbb9aed9aa7db32d458ee93a5
# Parent  038f9624d8e8b6a0700843687dea18d4f76d33e9# Parent  72679a30e1cb464d1dc7c74b14b848c3a51538ca
merge of '038f9624d8e8b6a0700843687dea18d4f76d33e9'
     and '72679a30e1cb464d1dc7c74b14b848c3a51538ca'

diff -r 038f9624d8e8 -r 9be593758c72 libpurple/core.c
--- 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;
 }
diff -r 038f9624d8e8 -r 9be593758c72 libpurple/prefs.c
--- 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;
 }