comparison src/conversation.c @ 9620:c001be3c330e

[gaim-migrate @ 10464] Changes to those get_alias functions in blist.c from Christopher (siege) O'Brien: Renames gaim_get_buddy_alias to gaim_buddy_get_alias Renames gaim_get_buddy_alias_only to _gaim_buddy_get_alias_only Adds function gaim_buddy_get_contact_alias, which looks up a buddy's appropriate display name by order of: buddy alias; contact alias; server alias; buddy name. Note that the buddy alias is still the top-priority. Changed conversation.c to use _get_contact_alias rather than _get_alias The end result of this is that aliasing the contact will result in conversations with any of that contact's buddies using the contact alias. This allows people like myself to no longer have to alias each buddy to the same alias in order to achieve the same effect. committer: Tailor Script <[e-mail]>

9619:da88e2cd5c53

	name = gaim_conversation_get_name(conv);

	if (gaim_prefs_get_bool("/core/conversations/use_alias_for_title")) {
		if(gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
			if(account && ((b = gaim_find_buddy(account, name)) != NULL))
				text = gaim_get_buddy_alias(b);
		} else if(gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
			if(account && ((chat = gaim_blist_find_chat(account, name)) != NULL))
				text = chat->alias;
		}
	}

					b = gaim_find_buddy(account,
							    gaim_account_get_username(account));

					if (gaim_account_get_alias(account) != NULL)
						who = account->alias;
					else if (b != NULL && strcmp(b->name, gaim_get_buddy_alias(b)))
						who = gaim_get_buddy_alias(b);
					else if (gaim_connection_get_display_name(gc) != NULL)
						who = gaim_connection_get_display_name(gc);
					else
						who = gaim_account_get_username(account);
				}
				else {
					b = gaim_find_buddy(account,
							    gaim_conversation_get_name(conv));

					if (b != NULL)
						who = gaim_get_buddy_alias(b);
					else
						who = gaim_conversation_get_name(conv);
				}
			}
			else {
				b = gaim_find_buddy(account, who);

				if (b != NULL)
					who = gaim_get_buddy_alias(b);
			}
		}
	}

	if (gaim_conversation_is_logging(conv))

9620:c001be3c330e

	name = gaim_conversation_get_name(conv);

	if (gaim_prefs_get_bool("/core/conversations/use_alias_for_title")) {
		if(gaim_conversation_get_type(conv) == GAIM_CONV_IM) {
			if(account && ((b = gaim_find_buddy(account, name)) != NULL))
				text = gaim_buddy_get_contact_alias(b);
		} else if(gaim_conversation_get_type(conv) == GAIM_CONV_CHAT) {
			if(account && ((chat = gaim_blist_find_chat(account, name)) != NULL))
				text = chat->alias;
		}
	}

					b = gaim_find_buddy(account,
							    gaim_account_get_username(account));

					if (gaim_account_get_alias(account) != NULL)
						who = account->alias;
					else if (b != NULL && strcmp(b->name, gaim_buddy_get_contact_alias(b)))
						who = gaim_buddy_get_contact_alias(b);
					else if (gaim_connection_get_display_name(gc) != NULL)
						who = gaim_connection_get_display_name(gc);
					else
						who = gaim_account_get_username(account);
				}
				else {
					b = gaim_find_buddy(account,
							    gaim_conversation_get_name(conv));

					if (b != NULL)
						who = gaim_buddy_get_contact_alias(b);
					else
						who = gaim_conversation_get_name(conv);
				}
			}
			else {
				b = gaim_find_buddy(account, who);

				if (b != NULL)
					who = gaim_buddy_get_contact_alias(b);
			}
		}
	}

	if (gaim_conversation_is_logging(conv))