adium 2267:3db85aa29006: Prevent contacts who cannot join meta c...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/3db85aa29006
revision:	2267:3db85aa29006
author:		Zachary West <zacw at adium.im>
date:		Thu May 21 15:06:28 2009 -0400

Prevent contacts who cannot join meta contacts from being combined into meta contacts. Fixes #12134.

diffstat:

 Source/AIListController.m |  13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diffs (23 lines):

diff -r 2ff64a5667c2 -r 3db85aa29006 Source/AIListController.m
--- a/Source/AIListController.m	Thu May 21 14:43:10 2009 -0400
+++ b/Source/AIListController.m	Thu May 21 15:06:28 2009 -0400
@@ -858,6 +858,19 @@
 
 - (void)promptToCombineItems:(NSArray *)items withContact:(AIListContact *)inContact
 {
+	for (AIListContact *listContact in [items arrayByAddingObject:inContact]) {
+		// Make sure all of the items can join the contact.
+		if (!listContact.canJoinMetaContacts) {
+			NSRunAlertPanel(AILocalizedString(@"Unable to Combine", nil),
+							AILocalizedString(@"%@ is not able to be combined into a meta contact.", nil),
+							AILocalizedStringFromTable(@"OK", @"Buttons", "Verb 'OK' on a button"),
+							nil,
+							nil,
+							listContact.displayName);
+			return;
+		}
+	}
+	
 	NSString	*promptTitle;
 	
 	//Appropriate prompt