adium-1.4 2905:518d5c44ce04: Bookmarks should not be able to be ...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/518d5c44ce04
revision:	2905:518d5c44ce04
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)
(transplanted from 049a102719256fd3fb0cdc67abd39f8520c79510)
Subject: adium-1.4 2906:5440bbb3ac1f: CodingStyle

details:	http://hg.adium.im/adium-1.4/rev/5440bbb3ac1f
revision:	2906:5440bbb3ac1f
author:		Evan Schoenberg
date:		Sat Mar 13 20:30:05 2010 -0600

CodingStyle
(transplanted from 8d3eb1d1acaf8135f1155ee27ff844a1d7c739a4)

diffs (56 lines):

diff -r 6919c3b23dcd -r 5440bbb3ac1f 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	Sat Mar 13 20:30:05 2010 -0600
@@ -21,6 +21,7 @@
 #import <Adium/AIListContactGroupChatCell.h>
 #import <Adium/AIProxyListObject.h>
 #import "AIMessageTabViewItem.h"
+#import "AIListBookmark.h"
 
 @implementation ESChatUserListController
 
@@ -87,6 +88,12 @@
 	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 +129,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 6919c3b23dcd -r 5440bbb3ac1f 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	Sat Mar 13 20:30:05 2010 -0600
@@ -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)
 
@@ -117,7 +118,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;