[Gaim-commits] CVS: gaim/src core.c,1.92,1.93

[Evan S. <ev...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2900

Modified Files:
	core.c 
Log Message:
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.



Index: core.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -p -r1.92 -r1.93
--- core.c	16 Feb 2006 00:45:22 -0000	1.92
+++ core.c	9 Mar 2006 15:49:34 -0000	1.93
@@ -109,7 +109,10 @@ gaim_core_init(const char *ui)
 	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_core_init(const char *ui)
 	gaim_conversations_init();
 	gaim_blist_init();
 	gaim_log_init();
-	gaim_buddy_icons_init();
 	gaim_network_init();
 	gaim_privacy_init();
 	gaim_pounces_init();