# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1157871743 0
# Node ID aee74d84816caf0a32cc2bc81a2d99416b7cc150
# Parent  c804f41d61aea4a9161f7f23df491db5ce913974
[gaim-migrate @ 17215]
The changes I committed earlier, from a patch from wabz, resulted in notices in an AIM conversation that the buddy had changed the alias to (null). After looking at the code, I believe the old code was wrong, but maybe it's me that's wrong. In any case, I think this will clear things up.

committer: Tailor Script <tailor@pidgin.im>

diff -r c804f41d61ae -r aee74d84816c libgaim/server.c
--- a/libgaim/server.c	Sun Sep 10 05:33:52 2006 +0000
+++ b/libgaim/server.c	Sun Sep 10 07:02:23 2006 +0000
@@ -215,13 +215,16 @@
 	for (buds = buddies; buds; buds = buds->next)
 	{
 		b = buds->data;
-		if (b->server_alias && !strcmp(b->server_alias, alias))
+		if ((b->server_alias == NULL && alias == NULL) ||
+		    (b->server_alias && alias && !strcmp(b->server_alias, alias)))
+		{
 			continue;
+		}
 		gaim_blist_server_alias_buddy(b, alias);
 
 		conv = gaim_find_conversation_with_account(GAIM_CONV_TYPE_IM, b->name, account);
 
-		if (conv != NULL)
+		if (conv != NULL && alias != NULL)
 		{
 			char *tmp = g_strdup_printf(_("%s is now known as %s.\n"),
 										who, alias);