merge of '1bb7565a1fc2ab312467c69846bd0123db9cd398'

Wed, 29 Aug 2007 04:03:01 +0000

author
William Ehlhardt <williamehlhardt@gmail.com>
date
Wed, 29 Aug 2007 04:03:01 +0000
changeset 19682
c335506d3fbe
parent 19680
1bb7565a1fc2 (current diff)
parent 19681
8399d8f69f1b (diff)
child 19685
0b268feab940

merge of '1bb7565a1fc2ab312467c69846bd0123db9cd398'
and '8399d8f69f1b370e204b39a4e0f4e0157be9e45c'

--- 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:
--- 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 */

mercurial