Mercurial > pidgin.yaz
changeset 11247:e5aa4398003e
[gaim-migrate @ 13416]
Fix the bug where our screen name would not be shown when sending an
IM to someone over protocols where you do not have a server-side alias,
and you have not set a self-alias for yourself.
This was caused by Sean's commit of a patch which brough conversastion.c
to revision 1.644. Anyone know the reason for this change? The
commit message was
"Todd Troxell removed IM aliases from chat rooms. Unfortunate, but necessary"
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Sat, 13 Aug 2005 02:26:57 +0000 |
| parents | df67c09ade6e |
| children | a2eababc78a8 |
| files | src/account.c src/conversation.c |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/account.c Sat Aug 13 00:49:50 2005 +0000 +++ b/src/account.c Sat Aug 13 02:26:57 2005 +0000 @@ -570,7 +570,8 @@ child = xmlnode_get_child(node, "alias"); if ((child != NULL) && ((data = xmlnode_get_data(child)) != NULL)) { - gaim_account_set_alias(ret, data); + if (*data != '\0') + gaim_account_set_alias(ret, data); g_free(data); }
--- a/src/conversation.c Sat Aug 13 00:49:50 2005 +0000 +++ b/src/conversation.c Sat Aug 13 02:26:57 2005 +0000 @@ -1316,6 +1316,8 @@ 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 who = gaim_account_get_username(account);