pidgin: 06438241: Clean up merges from the last two (un)di...

[datallah at pidgin.im]

-----------------------------------------------------------------
Revision: 064382411348c3315259f612a48b33acb62b2ed5
Ancestor: d4dd577b07a67655547a017b84aaa528588413cb
Author: datallah at pidgin.im
Date: 2009-01-20T04:45:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/064382411348c3315259f612a48b33acb62b2ed5

Modified files:
        libpurple/core.c libpurple/prefs.c

ChangeLog: 

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

-------------- next part --------------
============================================================
--- libpurple/core.c	01712893ff35f6e5f24219501f4f896308d45b50
+++ libpurple/core.c	e201d2611dfde87f9b6ec35aa8ef0c8c5ab8d8e8
@@ -251,7 +251,6 @@ purple_core_quit(void)
 #ifdef _WIN32
 	wpurple_cleanup();
 #endif
-	purple_prefs_uninit();
 
 	_core = NULL;
 }
============================================================
--- libpurple/prefs.c	e012728e84d062930118de5d89996a58cb0c6126
+++ libpurple/prefs.c	8be9a47407e09fdfd0f6e7451aada93f50e110c3
@@ -1454,7 +1454,6 @@ purple_prefs_uninit()
 		save_timer = 0;
 		sync_prefs();
 	}
-	prefs_loaded = FALSE;
 
 	prefs_loaded = FALSE;
 	purple_prefs_destroy();