adium 3153:049a10271925: Bookmarks should not be able to be invi...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/049a10271925
revision:	3153:049a10271925
author:		William Bowling <will at wbowling.info>
date:		Tue Nov 03 15:33:33 2009 +1100

Bookmarks should not be able to be invited to chats.

Removes the "Invite to Chat" menu for bookmarks as well as disabling drag and drop for bookmarks into group chats.
(transplanted from 4758aba8104ad44c683e987131e84fa3daddd9ba)

diffs (57 lines):

diff -r 61e07c6048df -r 049a10271925 Plugins/Dual Window Interface/ESChatUserListController.m
--- a/Plugins/Dual Window Interface/ESChatUserListController.m	Sat Mar 13 20:25:36 2010 -0600
+++ b/Plugins/Dual Window Interface/ESChatUserListController.m	Tue Nov 03 15:33:33 2009 +1100
@@ -21,6 +21,7 @@
 #import <Adium/AIListContactGroupChatCell.h>
 #import <Adium/AIProxyListObject.h>
 #import "AIMessageTabViewItem.h"
+#import "AIListBookmark.h"
 
 @implementation ESChatUserListController
 
@@ -87,6 +88,13 @@
 	for (AIProxyListObject *proxyObject in dragItems) {
 		AIListObject *listObject = proxyObject.listObject;
 		
+		//Dont allow Bookmarks to be invited to chat
+		if ([listObject isKindOfClass:[AIListBookmark class]])
+		{
+			success = NO;
+			break;
+		}
+		
 		if ([listObject isKindOfClass:[AIMetaContact class]]) {
 			listObject = [(AIMetaContact *)listObject preferredContactWithCompatibleService:activeChatAccount.service];
 		}
@@ -122,6 +130,11 @@
 	for (AIProxyListObject *proxyObject in dragItems) {
 		AIListObject *listObject = proxyObject.listObject;
 		
+		//Dont allow bookmarks to be dropped
+		if ([listObject isKindOfClass:[AIListBookmark class]]) {
+			return NSDragOperationNone;
+		}
+		
 		if ([listObject isKindOfClass:[AIMetaContact class]]) {
 			listObject = [(AIMetaContact *)listObject preferredContactWithCompatibleService:activeChatAccount.service];
 		}
diff -r 61e07c6048df -r 049a10271925 Plugins/Invite to Chat Plugin/DCInviteToChatPlugin.m
--- a/Plugins/Invite to Chat Plugin/DCInviteToChatPlugin.m	Sat Mar 13 20:25:36 2010 -0600
+++ b/Plugins/Invite to Chat Plugin/DCInviteToChatPlugin.m	Tue Nov 03 15:33:33 2009 +1100
@@ -27,6 +27,7 @@
 #import <Adium/AIListObject.h>
 #import <Adium/AIMetaContact.h>
 #import <Adium/AIService.h>
+#import "AIListBookmark.h"
 
 #define INVITE_CONTACT			AILocalizedString(@"Invite to Chat",nil)
 
@@ -118,7 +119,7 @@
 	NSArray			*openChats = [adium.interfaceController openChats];
 	NSMenu			*menu_chatMenu = nil;
 	
-	if (contact && ![contact isKindOfClass:[AIListGroup class]]) {
+	if (contact && ![contact isKindOfClass:[AIListGroup class]] && ![contact isKindOfClass:[AIListBookmark class]]) {
 		NSEnumerator	*enumerator;
 		NSString		*serviceClass;
 		NSDictionary	*serviceDict;