[Gaim-commits] SF.net SVN: gaim: [17215] trunk/libgaim/server.c

[<rl...@us...>]

Revision: 17215
          http://svn.sourceforge.net/gaim/?rev=17215&view=rev
Author:   rlaager
Date:     2006-09-10 00:02:23 -0700 (Sun, 10 Sep 2006)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/libgaim/server.c

Modified: trunk/libgaim/server.c
===================================================================
--- trunk/libgaim/server.c	2006-09-10 05:33:52 UTC (rev 17214)
+++ trunk/libgaim/server.c	2006-09-10 07:02:23 UTC (rev 17215)
@@ -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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.