# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1177832374 0
# Node ID ce913744ec7a92e5ae2bfceefce2785ad6e753e9
# Parent  6de769ad94fed3d7c579bf158605b388d94739b6# Parent  f9c369b4291cc20bd26efc389132066981ad9b61
merge of '557e47b9ec14d09e99b29f06c9984516ee78ade9'
     and 'ed9fe95c113aaf3142881804b571bafaa02a0f45'

diff -r 6de769ad94fe -r ce913744ec7a libpurple/account.c
--- a/libpurple/account.c	Sun Apr 29 07:27:26 2007 +0000
+++ b/libpurple/account.c	Sun Apr 29 07:39:34 2007 +0000
@@ -802,7 +802,7 @@
 
 	xmlnode_free(node);
 
-	purple_buddy_icons_account_loaded_cb();
+	_purple_buddy_icons_account_loaded_cb();
 }
 
 
diff -r 6de769ad94fe -r ce913744ec7a libpurple/blist.c
--- a/libpurple/blist.c	Sun Apr 29 07:27:26 2007 +0000
+++ b/libpurple/blist.c	Sun Apr 29 07:39:34 2007 +0000
@@ -607,7 +607,7 @@
 	xmlnode_free(purple);
 
 	/* This tells the buddy icon code to do its thing. */
-	purple_buddy_icons_blist_loaded_cb();
+	_purple_buddy_icons_blist_loaded_cb();
 }
 
 
diff -r 6de769ad94fe -r ce913744ec7a libpurple/core.c
--- a/libpurple/core.c	Sun Apr 29 07:27:26 2007 +0000
+++ b/libpurple/core.c	Sun Apr 29 07:39:34 2007 +0000
@@ -641,7 +641,7 @@
 	}
 
 	old_icons_dir = g_build_filename(old_user_dir, "icons", NULL);
-	purple_buddy_icon_set_old_icons_dir(old_icons_dir);
+	_purple_buddy_icon_set_old_icons_dir(old_icons_dir);
 	g_free(old_icons_dir);
 
 	g_free(old_user_dir);