Mercurial > pidgin
changeset 16642:a017913160cd
merge of 'a378fe8f729ea78fcd5280cc0b37072840f3b8ad'
and 'ed9fe95c113aaf3142881804b571bafaa02a0f45'
| author | William Ehlhardt <williamehlhardt@gmail.com> |
|---|---|
| date | Sun, 29 Apr 2007 07:38:49 +0000 |
| parents | ee36e4bd84ca (current diff) f9c369b4291c (diff) |
| children | 8ef2d30bc1bf |
| files | |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/account.c Sun Apr 29 07:21:00 2007 +0000 +++ b/libpurple/account.c Sun Apr 29 07:38:49 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:21:00 2007 +0000 +++ b/libpurple/blist.c Sun Apr 29 07:38:49 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:21:00 2007 +0000 +++ b/libpurple/core.c Sun Apr 29 07:38:49 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);