# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1171580744 0
# Node ID 58ec6ce6908d5a39249b18050d1a774ca9bff736
# Parent  35fa1d1c4ef28e9df7f0dc800b0edc438616f412# Parent  e023cc99eb391695fbec8f38214cccf694d01f15
merge of '2155bccb10577fa20eb47ac96a4912c91545a540'
     and 'ef4dfbce2370b5d09f48c571a9acb17da53c46c5'

diff -r 35fa1d1c4ef2 -r 58ec6ce6908d libpurple/server.c
--- 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);