Mercurial > pidgin
changeset 28258:4eca423c63e1
disapproval of revision 'f7d26d95395d5013710b12cfdfcf131aa1033e0c'
| author | John Bailey <rekkanoryo@rekkanoryo.org> |
|---|---|
| date | Wed, 16 Sep 2009 15:35:45 +0000 |
| parents | e8eaf57f42da |
| children | 7686397d2282 |
| files | ChangeLog.API libpurple/account.c libpurple/account.h |
| diffstat | 3 files changed, 0 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog.API Sat Aug 15 05:10:07 2009 +0000 +++ b/ChangeLog.API Wed Sep 16 15:35:45 2009 +0000 @@ -22,7 +22,6 @@ 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
--- a/libpurple/account.c Sat Aug 15 05:10:07 2009 +0000 +++ b/libpurple/account.c Wed Sep 16 15:35:45 2009 +0000 @@ -2016,42 +2016,6 @@ 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) {
--- a/libpurple/account.h Sat Aug 15 05:10:07 2009 +0000 +++ b/libpurple/account.h Wed Sep 16 15:35:45 2009 +0000 @@ -630,20 +630,6 @@ 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.