Clean up merges from the last two (un)disapprovals.

Tue, 20 Jan 2009 04:45:56 +0000

author
Daniel Atallah <datallah@pidgin.im>
date
Tue, 20 Jan 2009 04:45:56 +0000
changeset 25449
52c1bab8d88d
parent 25448
caad1da6977e
child 25450
0ae013105e09

Clean up merges from the last two (un)disapprovals.

libpurple/core.c file | annotate | diff | comparison | revisions
libpurple/prefs.c file | annotate | diff | comparison | revisions
--- 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();

mercurial