changeset 24979:7e2f27351358

Clean up merges from the last two (un)disapprovals.
author Daniel Atallah <daniel.atallah@gmail.com>
date Tue, 20 Jan 2009 04:45:56 +0000
parents 59ce16832872
children a69ce97a1600
files libpurple/core.c libpurple/prefs.c
diffstat 2 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
 }
--- 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();