# HG changeset patch
# User William Ehlhardt <williamehlhardt@gmail.com>
# Date 1188360181 0
# Node ID dbed19b9773bf0c3b25fe5854534ade7464fe57d
# Parent  2e27d9291197706012b31468bb45a5b69c8dec34# Parent  098c046020658b64304c6a61973d7ab120dee5fa
merge of '770ac36e679db47d463b561e8972d12c2f77bd4f'
     and '86832a578d8073ab4e867eeeab304f44c5a233c4'

diff -r 2e27d9291197 -r dbed19b9773b ChangeLog.API
--- a/ChangeLog.API	Wed Aug 29 04:01:42 2007 +0000
+++ b/ChangeLog.API	Wed Aug 29 04:03:01 2007 +0000
@@ -6,6 +6,9 @@
 		* PURPLE_MESSAGE_INVISIBLE flag, which can be used by
 		  purple_conv_im_send_with_flags to send a message, but not display it
 		  in the conversation
+		Changed:
+		* purple_prefs_load is now called within purple_prefs_init.
+		  The UI no longer needs to call it.
 
 	Pidgin:
 		Added:
diff -r 2e27d9291197 -r dbed19b9773b finch/finch.c
--- a/finch/finch.c	Wed Aug 29 04:01:42 2007 +0000
+++ b/finch/finch.c	Wed Aug 29 04:03:01 2007 +0000
@@ -360,9 +360,7 @@
 	purple_set_blist(purple_blist_new());
 	purple_blist_load();
 
-	/* TODO: Move prefs loading into purple_prefs_init() */
-	purple_prefs_load();
-	purple_prefs_update_old();
+	/* TODO: should this be moved into finch_prefs_init() ? */
 	finch_prefs_update_old();
 
 	/* load plugins we had when we quit */