adium 2281:74f987cd2b36: Use the display name when no formatted ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/74f987cd2b36
revision:	2281:74f987cd2b36
author:		Zachary West <zacw at adium.im>
date:		Sat May 23 14:51:32 2009 -0400

Use the display name when no formatted UID is present for a meta contact. Fixes #11901.

diffstat:

 ChangeLogs/Changes Between Betas.txt              |  1 +
 Frameworks/Adium Framework/Source/AIContactMenu.m |  8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r e051a5adab7d -r 74f987cd2b36 ChangeLogs/Changes Between Betas.txt
--- a/ChangeLogs/Changes Between Betas.txt	Sat May 23 14:37:55 2009 -0400
+++ b/ChangeLogs/Changes Between Betas.txt	Sat May 23 14:51:32 2009 -0400
@@ -1,5 +1,6 @@
 Adium 1.4 b2
  * Added HTML classes to the action links for Twitter messages, so message styles can more easily present them as they wish. (#12049)
+ * Fixed not being able to add events. (#11901)
  * Fixed identifying to some NickServ instances which didn't expect a nickname as an argument. (#12067)
  * Fixed offline status messages for contacts, as well as the display of errors for XMPP contacts.
  * Fixed a crash on startup dealing with the address book.
diff -r e051a5adab7d -r 74f987cd2b36 Frameworks/Adium Framework/Source/AIContactMenu.m
--- a/Frameworks/Adium Framework/Source/AIContactMenu.m	Sat May 23 14:37:55 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIContactMenu.m	Sat May 23 14:51:32 2009 -0400
@@ -288,11 +288,13 @@
 			[menuItem setImage:[self imageForListObject:listObject usingUserIcon:shouldUseUserIcon]];
 		}
 		
-		if (!(shouldUseDisplayName ? listObject.displayName : listObject.formattedUID)) {
-			NSLog(@"%@ nil? sUDN = %d, dN = %@, fUID = %@", listObject, shouldUseDisplayName, listObject.displayName, listObject.formattedUID);
+		NSString *displayName = listObject.displayName;
+		
+		if (!shouldUseDisplayName && listObject.formattedUID) {
+			displayName = listObject.formattedUID;
 		}
 		
-		[menuItem setTitle:(shouldUseDisplayName ? listObject.displayName : listObject.formattedUID)];
+		[menuItem setTitle:displayName];
 		[menuItem setToolTip:(shouldSetTooltip ? [listObject.statusMessage string] : nil)];
 
 		[[menuItem menu] setMenuChangedMessagesEnabled:YES];