Mercurial > pidgin.yaz
changeset 10667:51ea57c36056
[gaim-migrate @ 12207]
Todd Troxell removed IM aliases from chat rooms. Unfortunate, but necessary
committer: Tailor Script <tailor@pidgin.im>
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Mon, 07 Mar 2005 19:09:45 +0000 |
| parents | b39d5850883a |
| children | aafe8f30b826 |
| files | COPYRIGHT src/conversation.c |
| diffstat | 2 files changed, 11 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Mon Mar 07 18:58:52 2005 +0000 +++ b/COPYRIGHT Mon Mar 07 19:09:45 2005 +0000 @@ -191,6 +191,7 @@ Stu Tomlinson Bill Tompkins Tom Tromey +Todd Troxell Chris Toshok Brad Turcotte Junichi Uekawa
--- a/src/conversation.c Mon Mar 07 18:58:52 2005 +0000 +++ b/src/conversation.c Mon Mar 07 19:09:45 2005 +0000 @@ -1465,13 +1465,14 @@ if (flags & GAIM_MESSAGE_SEND) { 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); + if (gaim_conversation_get_type(conv) != GAIM_CONV_CHAT) { + 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); } @@ -1479,13 +1480,13 @@ b = gaim_find_buddy(account, gaim_conversation_get_name(conv)); - if (b != NULL) + if (b != NULL && gaim_conversation_get_type(conv) != GAIM_CONV_CHAT) who = gaim_buddy_get_contact_alias(b); else who = gaim_conversation_get_name(conv); } } - else if ((who != NULL) && (*who != '\0')) { + else if ((who != NULL) && (*who != '\0') && gaim_conversation_get_type(conv) != GAIM_CONV_CHAT) { b = gaim_find_buddy(account, who); if (b != NULL)