changeset 16639:ce913744ec7a

merge of '557e47b9ec14d09e99b29f06c9984516ee78ade9' and 'ed9fe95c113aaf3142881804b571bafaa02a0f45'
author Mark Doliner <mark@kingant.net>
date Sun, 29 Apr 2007 07:39:34 +0000
parents 6de769ad94fe (current diff) f9c369b4291c (diff)
children 985bf8c7b8d1
files
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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();
 }
 
 
--- 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();
 }
 
 
--- 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);