# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1231473421 0
# Node ID 1563f269a714fb08ff93c37521eaa258574579b0
# Parent  60ae522a239aa5d5a31372e55ef29de830ef7031
disapproval of revision 'c1eb11b61c6c6756eba2e3aa380e4e4e09db0914'

Disable the prefs unint changes for now because they are problematic. Refs #7761.

diff -r 60ae522a239a -r 1563f269a714 libpurple/core.c
--- a/libpurple/core.c	Sat Jan 03 18:37:37 2009 +0000
+++ b/libpurple/core.c	Fri Jan 09 03:57:01 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 60ae522a239a -r 1563f269a714 libpurple/prefs.c
--- a/libpurple/prefs.c	Sat Jan 03 18:37:37 2009 +0000
+++ b/libpurple/prefs.c	Fri Jan 09 03:57:01 2009 +0000
@@ -714,8 +714,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);
@@ -1454,7 +1453,7 @@
 		save_timer = 0;
 		sync_prefs();
 	}
-	prefs_loaded = FALSE;
+
 	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
 	purple_prefs_destroy();
 	g_hash_table_destroy(prefs_hash);