comparison libpurple/account.c @ 29712:d5fe33c3a765

propagate from branch 'im.pidgin.pidgin' (head 42a8485e73af5f2091d307b51c09dded94eceb24) to branch 'im.pidgin.pidgin.next.minor' (head 4edcf8da14be654127117da5af0cbdd7a0616439)
author John Bailey <rekkanoryo@rekkanoryo.org>
date Tue, 17 Nov 2009 07:33:47 +0000
parents e3206d6da6c7
children dcd52d2b1b97
comparison
equal deleted inserted replaced
28963:546e870dc506 29712:d5fe33c3a765
2030 g_return_val_if_fail(account != NULL, NULL); 2030 g_return_val_if_fail(account != NULL, NULL);
2031 2031
2032 return account->gc; 2032 return account->gc;
2033 } 2033 }
2034 2034
2035 const gchar *
2036 purple_account_get_name_for_display(const PurpleAccount *account)
2037 {
2038 PurpleBuddy *self = NULL;
2039 PurpleConnection *gc = NULL;
2040 const gchar *name = NULL, *username = NULL, *displayname = NULL;
2041
2042 name = purple_account_get_alias(account);
2043
2044 if (name) {
2045 return name;
2046 }
2047
2048 username = purple_account_get_username(account);
2049 self = purple_find_buddy((PurpleAccount *)account, username);
2050
2051 if (self) {
2052 const gchar *calias= purple_buddy_get_contact_alias(self);
2053
2054 /* We don't want to return the buddy name if the buddy/contact
2055 * doesn't have an alias set. */
2056 if (!purple_strequal(username, calias)) {
2057 return calias;
2058 }
2059 }
2060
2061 gc = purple_account_get_connection(account);
2062 displayname = purple_connection_get_display_name(gc);
2063
2064 if (displayname) {
2065 return displayname;
2066 }
2067
2068 return username;
2069 }
2070
2035 gboolean 2071 gboolean
2036 purple_account_get_remember_password(const PurpleAccount *account) 2072 purple_account_get_remember_password(const PurpleAccount *account)
2037 { 2073 {
2038 g_return_val_if_fail(account != NULL, FALSE); 2074 g_return_val_if_fail(account != NULL, FALSE);
2039 2075