# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1232426756 0
# Node ID 7e2f27351358254e4524361e6e2b845e568e732a
# Parent  59ce168328724badbfae20e688d4ba1e84ac27b0
Clean up merges from the last two (un)disapprovals.

diff -r 59ce16832872 -r 7e2f27351358 libpurple/core.c
--- a/libpurple/core.c	Tue Jan 20 04:39:54 2009 +0000
+++ b/libpurple/core.c	Tue Jan 20 04:45:56 2009 +0000
@@ -251,7 +251,6 @@
 #ifdef _WIN32
 	wpurple_cleanup();
 #endif
-	purple_prefs_uninit();
 
 	_core = NULL;
 }
diff -r 59ce16832872 -r 7e2f27351358 libpurple/prefs.c
--- a/libpurple/prefs.c	Tue Jan 20 04:39:54 2009 +0000
+++ b/libpurple/prefs.c	Tue Jan 20 04:45:56 2009 +0000
@@ -1454,7 +1454,6 @@
 		save_timer = 0;
 		sync_prefs();
 	}
-	prefs_loaded = FALSE;
 
 	prefs_loaded = FALSE;
 	purple_prefs_destroy();