Mercurial > pidgin.yaz
changeset 15642:58ec6ce6908d
merge of '2155bccb10577fa20eb47ac96a4912c91545a540'
and 'ef4dfbce2370b5d09f48c571a9acb17da53c46c5'
| author | Sean Egan <seanegan@gmail.com> |
|---|---|
| date | Thu, 15 Feb 2007 23:05:44 +0000 |
| parents | 35fa1d1c4ef2 (current diff) e023cc99eb39 (diff) |
| children | ad6f0fb3f8f9 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/server.c Thu Feb 15 22:43:24 2007 +0000 +++ b/libpurple/server.c Thu Feb 15 23:05:44 2007 +0000 @@ -223,7 +223,7 @@ conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, b->name, account); - if (conv != NULL && alias != NULL) + if (conv != NULL && alias != NULL && strcmp(alias, who)) { char *tmp = g_strdup_printf(_("%s is now known as %s.\n"), who, alias);