adium 2129:e7932358d256: Don't try and determine a fallback alia...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/e7932358d256
revision:	2129:e7932358d256
author:		Zachary West <zacw at adium.im>
date:		Sun May 10 16:33:20 2009 -0400

Don't try and determine a fallback alias in a non-group-chat.
Subject: adium 2130:1b9cd87159b9: Get a context menu for the meta contact of a tab, not the current chat destination.

details:	http://hg.adium.im/adium/rev/1b9cd87159b9
revision:	2130:1b9cd87159b9
author:		Zachary West <zacw at adium.im>
date:		Sun May 10 16:49:23 2009 -0400

Get a context menu for the meta contact of a tab, not the current chat destination.

diffstat:

 Frameworks/Adium Framework/Source/AIChat.m                |  2 +-
 Plugins/Dual Window Interface/AIMessageWindowController.m |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 9992255c5007 -r 1b9cd87159b9 Frameworks/Adium Framework/Source/AIChat.m
--- a/Frameworks/Adium Framework/Source/AIChat.m	Sun May 10 15:36:59 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIChat.m	Sun May 10 16:49:23 2009 -0400
@@ -323,7 +323,7 @@
 {
 	NSString *alias = [participatingContactsAliases objectForKey:contact.UID];
 	
-	if (!alias) {
+	if (!alias && self.isGroupChat) {
 		alias = [self.account fallbackAliasForContact:(AIListContact *)contact inChat:self];
 	}
 	
diff -r 9992255c5007 -r 1b9cd87159b9 Plugins/Dual Window Interface/AIMessageWindowController.m
--- a/Plugins/Dual Window Interface/AIMessageWindowController.m	Sun May 10 15:36:59 2009 -0400
+++ b/Plugins/Dual Window Interface/AIMessageWindowController.m	Sun May 10 16:49:23 2009 -0400
@@ -809,7 +809,7 @@
 - (NSMenu *)tabView:(NSTabView *)tabView menuForTabViewItem:(NSTabViewItem *)tabViewItem
 {
 	AIChat			*chat = [(AIMessageTabViewItem *)tabViewItem chat];
-    AIListContact	*selectedObject = chat.listObject;
+    AIListContact	*selectedObject = chat.listObject.parentContact;
     NSMenu			*tmp = nil;
 
     if (selectedObject) {