Mercurial > pidgin.yaz
changeset 25293:d93c93dfa435
merge of 'af834be8e1d99f849b1cade9138e197d7ddf362a'
and 'eb6bef6c2bad87bebbd163d3db3e7c9512216a4b'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Fri, 31 Oct 2008 20:04:35 +0000 |
| parents | 8d562557ed6f (current diff) 178efff39041 (diff) |
| children | 8aa7d8bcbc7d |
| files | libpurple/protocols/gg/gg.c |
| diffstat | 3 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Fri Oct 31 10:14:23 2008 +0000 +++ b/ChangeLog.API Fri Oct 31 20:04:35 2008 +0000 @@ -8,6 +8,9 @@ * purple_connection_get_protocol_data * purple_connection_set_protocol_data + Deprecated: + * purple_buddy_get_local_alias + version 2.5.0 (08/18/2008): libpurple: Added:
--- a/libpurple/blist.h Fri Oct 31 10:14:23 2008 +0000 +++ b/libpurple/blist.h Fri Oct 31 20:04:35 2008 +0000 @@ -685,6 +685,7 @@ */ const char *purple_buddy_get_contact_alias(PurpleBuddy *buddy); +#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BLIST_C_) /** * Returns the correct alias for this user, ignoring server aliases. Used * when a user-recognizable name is required. In order: buddy's alias; buddy's @@ -692,8 +693,10 @@ * * @param buddy The buddy whose alias will be returned. * @return The appropriate name or alias. + * @deprecated Try purple_buddy_get_alias(), if server aliases are okay. */ const char *purple_buddy_get_local_alias(PurpleBuddy *buddy); +#endif /** * Returns the correct name to display for a buddy. In order of precedence:
--- a/libpurple/protocols/gg/gg.c Fri Oct 31 10:14:23 2008 +0000 +++ b/libpurple/protocols/gg/gg.c Fri Oct 31 20:04:35 2008 +0000 @@ -1907,7 +1907,7 @@ { PurpleAccount *account; GGPInfo *info = gc->proto_data; - const char *name = purple_buddy_get_name(buddy); + const gchar *name = purple_buddy_get_name(buddy); gg_add_notify(info->session, ggp_str_to_uin(name));