# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1253115866 0
# Node ID 94f85ba7e5a96c2c177c6eb1b375ae932380dee3
# Parent  df24cbb0d6e21e2ce87364f8fb7035d980e15496
This effectively moves Etan's API addition off im.pidgin.pidgin and onto
im.pidgin.pidgin.next.minor so we don't force a 2.7.0 too soon.

*** Plucked rev f7d26d95395d5013710b12cfdfcf131aa1033e0c (deryni@pidgin.im):
Add a purple_account_get_name_for_display function (I'm not a huge fan of that
name but didn't want to use get_display_name as that means something else for
connections).

This wants to be used in places where we need to display an identifier for the
account to the user and honor the appropriate aliases/etc.

Refs #8391

diff -r df24cbb0d6e2 -r 94f85ba7e5a9 ChangeLog.API
--- a/ChangeLog.API	Thu Sep 10 21:51:32 2009 +0000
+++ b/ChangeLog.API	Wed Sep 16 15:44:26 2009 +0000
@@ -3,6 +3,7 @@
 version 2.7.0 (??/??/????):
 	libpurple:
 		Added:
+		* purple_account_get_name_for_display
 		* purple_network_get_all_local_system_ips
 
 version 2.6.1 (08/18/2009):
diff -r df24cbb0d6e2 -r 94f85ba7e5a9 libpurple/account.c
--- a/libpurple/account.c	Thu Sep 10 21:51:32 2009 +0000
+++ b/libpurple/account.c	Wed Sep 16 15:44:26 2009 +0000
@@ -2019,6 +2019,42 @@
 	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)
 {
diff -r df24cbb0d6e2 -r 94f85ba7e5a9 libpurple/account.h
--- a/libpurple/account.h	Thu Sep 10 21:51:32 2009 +0000
+++ b/libpurple/account.h	Wed Sep 16 15:44:26 2009 +0000
@@ -630,6 +630,20 @@
 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.7.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.