Mercurial > pidgin
changeset 32050:38ce2e217fcb
purple_buddy_get_local_alias() has been deprecated since 2.6.0, and can be removed for 3.0.0.
| author | andrew.victor@mxit.com |
|---|---|
| date | Mon, 05 Sep 2011 20:08:59 +0000 |
| parents | 821942586292 |
| children | 968a51c4fa9d |
| files | ChangeLog.API libpurple/blist.c libpurple/blist.h libpurple/plugins/perl/common/BuddyList.xs |
| diffstat | 4 files changed, 1 insertions(+), 37 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Mon Sep 05 20:02:49 2011 +0000 +++ b/ChangeLog.API Mon Sep 05 20:08:59 2011 +0000 @@ -108,6 +108,7 @@ * purple_account_add_buddies_with_invite * purple_account_add_buddy_with_invite * purple_blist_update_buddy_icon + * purple_buddy_get_local_alias * purple_buddy_icons_has_custom_icon * purple_buddy_icons_find_custom_icon * purple_buddy_icons_set_custom_icon
--- a/libpurple/blist.c Mon Sep 05 20:02:49 2011 +0000 +++ b/libpurple/blist.c Mon Sep 05 20:08:59 2011 +0000 @@ -2364,26 +2364,6 @@ return NULL; } -const char *purple_buddy_get_local_alias(PurpleBuddy *buddy) -{ - PurpleContact *c; - - g_return_val_if_fail(buddy != NULL, NULL); - - /* Search for an alias for the buddy. In order of precedence: */ - /* The buddy alias */ - if (buddy->alias != NULL) - return buddy->alias; - - /* The contact alias */ - c = purple_buddy_get_contact(buddy); - if ((c != NULL) && (c->alias != NULL)) - return c->alias; - - /* The buddy's user name (i.e. no alias) */ - return buddy->name; -} - const char *purple_chat_get_name(PurpleChat *chat) { char *ret = NULL;
--- a/libpurple/blist.h Mon Sep 05 20:02:49 2011 +0000 +++ b/libpurple/blist.h Mon Sep 05 20:08:59 2011 +0000 @@ -852,19 +852,6 @@ */ 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 - * contact alias; buddy's user name. - * - * @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: * the buddy's alias; the buddy's server alias; the buddy's contact alias;
--- a/libpurple/plugins/perl/common/BuddyList.xs Mon Sep 05 20:02:49 2011 +0000 +++ b/libpurple/plugins/perl/common/BuddyList.xs Mon Sep 05 20:08:59 2011 +0000 @@ -421,9 +421,5 @@ Purple::BuddyList::Buddy buddy const char * -purple_buddy_get_local_alias(buddy) - Purple::BuddyList::Buddy buddy - -const char * purple_buddy_get_alias(buddy) Purple::BuddyList::Buddy buddy