[Gaim-commits] SF.net SVN: gaim: [16495] branches/v2_0_0/src/protocols/oscar/oscar.c

[<the...@us...>]

Revision: 16495
Author:   thekingant
Date:     2006-07-16 09:59:27 -0700 (Sun, 16 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16495&view=rev

Log Message:
-----------
Backport SVN revision #16494 from HEAD to v2_0_0
Original commit message:

Only do something about formatted screen names for AIM, not ICQ

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16494&view=rev

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/oscar/oscar.c
Modified: branches/v2_0_0/src/protocols/oscar/oscar.c
===================================================================
--- branches/v2_0_0/src/protocols/oscar/oscar.c	2006-07-16 16:59:10 UTC (rev 16494)
+++ branches/v2_0_0/src/protocols/oscar/oscar.c	2006-07-16 16:59:27 UTC (rev 16495)
@@ -2915,10 +2915,13 @@
 	if (b == NULL)
 		return 1;
 
-	if (strcmp(gaim_buddy_get_name(b), userinfo->sn))
-		serv_got_alias(gc, gaim_buddy_get_name(b), userinfo->sn);
-	else
-		serv_got_alias(gc, gaim_buddy_get_name(b), NULL);
+	if (!aim_sn_is_icq(userinfo->sn))
+	{
+		if (strcmp(gaim_buddy_get_name(b), userinfo->sn))
+			serv_got_alias(gc, gaim_buddy_get_name(b), userinfo->sn);
+		else
+			serv_got_alias(gc, gaim_buddy_get_name(b), NULL);
+	}
 
 	presence = gaim_buddy_get_presence(b);
 	status = gaim_presence_get_active_status(presence);


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