# HG changeset patch # User Evan Schoenberg # Date 1141919374 0 # Node ID ff06120eaf1eb9d3b30b68d44aab343dc2503200 # Parent 90740e70af91208c865ea7a6d5e3de5581f5d002 [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 diff -r 90740e70af91 -r ff06120eaf1e src/core.c --- 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();