changeset 13480:ff06120eaf1e

[gaim-migrate @ 15856] Initialize the buddy_icons system before initializing the accounts system. When the accounts system loads, load_accounts() calls parse_account(), which in turn can call gaim_account_set_buddy_icon(). gaim_account_set_buddy_icon() has several routes by which gaim_buddy_icons_get_cache_dir(), particularly if the buddy icon path points to a file which no longer exists, in gaim_buddy_icons_get_full_path(). If the buddy_icons system hasn't been initialized, gaim_buddy_icons_get_cache_dir() returns NULL, and that's bad. committer: Tailor Script <tailor@pidgin.im>
author Evan Schoenberg <evan.s@dreskin.net>
date Thu, 09 Mar 2006 15:49:34 +0000
parents 90740e70af91
children 56898561b8a9
files src/core.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/core.c	Thu Mar 09 15:44:08 2006 +0000
+++ b/src/core.c	Thu Mar 09 15:49:34 2006 +0000
@@ -109,7 +109,10 @@
 	gaim_plugins_init();
 	gaim_plugins_probe(G_MODULE_SUFFIX);
 
+	/* Accounts use status and buddy icons, so initialize these before accounts */
 	gaim_status_init();
+	gaim_buddy_icons_init();
+
 	gaim_accounts_init();
 	gaim_savedstatuses_init();
 	gaim_ciphers_init();
@@ -118,7 +121,6 @@
 	gaim_conversations_init();
 	gaim_blist_init();
 	gaim_log_init();
-	gaim_buddy_icons_init();
 	gaim_network_init();
 	gaim_privacy_init();
 	gaim_pounces_init();