pidgin: b0ddc504: purple_buddy_get_local_alias() has been ...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: b0ddc50414a7414193d23c8357e5e901ca4412fe
Parent:   0b1b58f25b4742595a772a11dd22b10fe8ec5c70
Author:   andrew.victor at mxit.com
Date:     09/05/11 16:08:59
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b0ddc50414a7414193d23c8357e5e901ca4412fe

Changelog: 

purple_buddy_get_local_alias() has been deprecated since 2.6.0, and can be removed for 3.0.0.


Changes against parent 0b1b58f25b4742595a772a11dd22b10fe8ec5c70

  patched  ChangeLog.API
  patched  libpurple/blist.c
  patched  libpurple/blist.h
  patched  libpurple/plugins/perl/common/BuddyList.xs

-------------- next part --------------
============================================================
--- libpurple/blist.c	af606d7e6bc7f28c5dc79f574b560e4197116877
+++ libpurple/blist.c	d08f5f13c2e25d7c70ec5e4f804df3850b6c49f1
@@ -2364,26 +2364,6 @@ const char *purple_buddy_get_server_alia
 	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;
============================================================
--- libpurple/blist.h	8105c6b05132a33fba59c892f96b1e1a7e42b506
+++ libpurple/blist.h	90d906af8a794fc2ad283bd50184e6335801c838
@@ -852,20 +852,7 @@ const char *purple_buddy_get_contact_ali
  */
 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;
  * the buddy's user name.
============================================================
--- libpurple/plugins/perl/common/BuddyList.xs	665c03a9e6d75d06e794026fcc1bf629d63ef995
+++ libpurple/plugins/perl/common/BuddyList.xs	3ea46fdf4991152bc447da87804c75b4fbb648dd
@@ -421,9 +421,5 @@ const char *
 	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
============================================================
--- ChangeLog.API	d4cf958b5ca23ad4771f5e06a6c755267a10e131
+++ ChangeLog.API	d78a2fd82fe3c4856c198156c15de4238bf4befb
@@ -108,6 +108,7 @@ version 3.0.0 (??/??/????):
 		* 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