merge of 'fee9e3594df58a51cf2b9616ff7e948d6d2b3d46'

     and '1fb16746439fa7a4bd378ee9cb8b61066c7817a6'

3 files changed, 3 insertions, 3 deletions

diff --git a/libpurple/account.c b/libpurple/account.c
index 3586812b8d..addee7d78b 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -802,7 +802,7 @@ load_accounts(void)
 
 	xmlnode_free(node);
 
-	purple_buddy_icons_account_loaded_cb();
+	_purple_buddy_icons_account_loaded_cb();
 }
 
 
diff --git a/libpurple/blist.c b/libpurple/blist.c
index cc2146c6b0..13c199bbc0 100644
--- a/libpurple/blist.c
+++ b/libpurple/blist.c
@@ -607,7 +607,7 @@ purple_blist_load()
 	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 --git a/libpurple/core.c b/libpurple/core.c
index cba62a6c79..457ba6e331 100644
--- a/libpurple/core.c
+++ b/libpurple/core.c
@@ -641,7 +641,7 @@ purple_core_migrate(void)
 	}
 
 	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);