pidgin: 21bc6a00: disapproval of revision 'f7d26d95395d501...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 21bc6a005e10217fb89ff6fe326c1f4174fadf73
Ancestor: f7d26d95395d5013710b12cfdfcf131aa1033e0c
Author: rekkanoryo at pidgin.im
Date: 2009-09-16T15:35:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/21bc6a005e10217fb89ff6fe326c1f4174fadf73

Modified files:
        ChangeLog.API libpurple/account.c libpurple/account.h

ChangeLog: 

disapproval of revision 'f7d26d95395d5013710b12cfdfcf131aa1033e0c'
-------------- next part --------------
============================================================
--- ChangeLog.API	963205d77d6862edca4bca15d41d4f501d7e430e
+++ ChangeLog.API	cf717ca4347c54f8e7960a8b203dc13e09373db3
@@ -22,7 +22,6 @@ version 2.6.0 (??/??/2009):
 		  and fwrite for saving a file locally. These allow a UI to stream a
 		  file through a socket without buffering the file on the local disk.
 		* Jabber plugin signals (see jabber-signals.dox)
-		* purple_account_get_name_for_display
 		* purple_account_remove_setting
 		* purple_buddy_destroy
 		* purple_buddy_get_protocol_data
============================================================
--- libpurple/account.c	e9d750c925baf05e60d13fe8efbb4ad305e8f802
+++ libpurple/account.c	ed1447e356c599eaf779b947205a136748e80eb4
@@ -2016,42 +2016,6 @@ purple_account_get_connection(const Purp
 	return account->gc;
 }
 
-const gchar *
-purple_account_get_name_for_display(const PurpleAccount *account)
-{
-	PurpleBuddy *self = NULL;
-	PurpleConnection *gc = NULL;
-	const gchar *name = NULL, *username = NULL, *displayname = NULL;
-
-	name = purple_account_get_alias(account);
-
-	if (name) {
-		return name;
-	}
-
-	username = purple_account_get_username(account);
-	self = purple_find_buddy((PurpleAccount *)account, username);
-
-	if (self) {
-		const gchar *calias= purple_buddy_get_contact_alias(self);
-
-		/* We don't want to return the buddy name if the buddy/contact
-		 * doesn't have an alias set. */
-		if (!purple_strequal(username, calias)) {
-			return calias;
-		}
-	}
-
-	gc = purple_account_get_connection(account);
-	displayname = purple_connection_get_display_name(gc);
-
-	if (displayname) {
-		return displayname;
-	}
-
-	return username;
-}
-
 gboolean
 purple_account_get_remember_password(const PurpleAccount *account)
 {
============================================================
--- libpurple/account.h	6ab74931ed59e9af3bf1d3c724b3d8066342a27a
+++ libpurple/account.h	ea27697ac2f242986507da6d4844daf5af06dbc2
@@ -630,20 +630,6 @@ PurpleConnection *purple_account_get_con
 PurpleConnection *purple_account_get_connection(const PurpleAccount *account);
 
 /**
- * Returns a name for this account appropriate for display to the user. In
- * order of preference: the account's alias; the contact or buddy alias (if
- * the account exists on its own buddy list); the connection's display name;
- * the account's username.
- *
- * @param account The account.
- *
- * @return The name to display.
- *
- * @since 2.6.0
- */
-const gchar *purple_account_get_name_for_display(const PurpleAccount *account);
-
-/**
  * Returns whether or not this account should save its password.
  *
  * @param account The account.