Mercurial > pidgin.yaz
changeset 16649:985bf8c7b8d1
merge of '5d2bf67f21822e51ffd4611f98cb0921564ff2b1'
and 'a378fe8f729ea78fcd5280cc0b37072840f3b8ad'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sun, 29 Apr 2007 07:39:37 +0000 |
| parents | ce913744ec7a (diff) ee36e4bd84ca (current diff) |
| children | 8ef2d30bc1bf |
| files | |
| diffstat | 4 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Sun Apr 29 07:21:00 2007 +0000 +++ b/configure.ac Sun Apr 29 07:39:37 2007 +0000 @@ -11,10 +11,15 @@ # purple_micro_version = 0 # purple_major_version += 1; # +# purple_version_suffix should be similar to one of the following: +# For beta releases: [beta2] +# For code under development: [devel] +# For production releases: [] +# m4_define([purple_major_version], [2]) m4_define([purple_minor_version], [0]) m4_define([purple_micro_version], [0]) -m4_define([purple_version_suffix], [devel]) +m4_define([purple_version_suffix], [beta7]) m4_define([purple_version], [purple_major_version.purple_minor_version.purple_micro_version]) m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
--- a/libpurple/account.c Sun Apr 29 07:21:00 2007 +0000 +++ b/libpurple/account.c Sun Apr 29 07:39:37 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:39:37 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:39:37 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);