adium-1.4 2993:df284444ba05: Fix a situation where contacts woul...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/df284444ba05
revision:	2993:df284444ba05
author:		Robert Vehse
date:		Mon Jun 28 14:32:25 2010 +0200

Fix a situation where contacts would have a blank alias when their AB card nickname is left blank. Patch by Rigdern reviewed by sphynx. Thanks, folks!

diffs (14 lines):

diff -r 624eff363410 -r df284444ba05 Frameworks/Adium Framework/Source/AIAddressBookController.m
--- a/Frameworks/Adium Framework/Source/AIAddressBookController.m	Mon Jun 28 14:26:47 2010 +0200
+++ b/Frameworks/Adium Framework/Source/AIAddressBookController.m	Mon Jun 28 14:32:25 2010 +0200
@@ -428,7 +428,9 @@
 	if (useMiddleName && middleName)
 		firstName = [NSString stringWithFormat:@"%@ %@", firstName, middleName];
 
-	if (useNickName && (nickName = [person valueForProperty:kABNicknameProperty])) {
+	if (useNickName &&
+		(nickName = [person valueForProperty:kABNicknameProperty]) &&
+		![nickName isEqualToString:@""]) {
 		displayName = nickName;
 
 	} else if (!lastName || (thisDisplayFormat == First)) {