adium 2403:867fe788c48c: Remove unused method
commits at adium.im
commits at adium.im
Sat May 30 00:29:41 UTC 2009
details: http://hg.adium.im/adium/rev/867fe788c48c
revision: 2403:867fe788c48c
author: David Smith <catfish.man at gmail.com>
date: Fri May 29 16:30:12 2009 -0700
Remove unused method
Subject: adium 2404:85974a9e8ba2: No reason to copy here
details: http://hg.adium.im/adium/rev/85974a9e8ba2
revision: 2404:85974a9e8ba2
author: David Smith <catfish.man at gmail.com>
date: Fri May 29 16:31:34 2009 -0700
No reason to copy here
Subject: adium 2405:4244d70c0ea5: This override did nothing
details: http://hg.adium.im/adium/rev/4244d70c0ea5
revision: 2405:4244d70c0ea5
author: David Smith <catfish.man at gmail.com>
date: Fri May 29 16:32:25 2009 -0700
This override did nothing
Subject: adium 2406:fb13c8681f26: Reduce duplication, and make it harder to misuse API.
details: http://hg.adium.im/adium/rev/fb13c8681f26
revision: 2406:fb13c8681f26
author: David Smith <catfish.man at gmail.com>
date: Fri May 29 16:55:51 2009 -0700
Reduce duplication, and make it harder to misuse API.
Subject: adium 2407:4a8924478c80: Fix warnings
details: http://hg.adium.im/adium/rev/4a8924478c80
revision: 2407:4a8924478c80
author: David Smith <catfish.man at gmail.com>
date: Fri May 29 17:03:32 2009 -0700
Fix warnings
diffs (162 lines):
diff -r 4a7a1638b23f -r 4a8924478c80 Frameworks/Adium Framework/Source/AIMetaContact.h
--- a/Frameworks/Adium Framework/Source/AIMetaContact.h Fri May 29 20:27:20 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIMetaContact.h Fri May 29 17:03:32 2009 -0700
@@ -30,7 +30,6 @@
NSMutableArray *_containedObjects; //Manually ordered array of contents
BOOL containedObjectsNeedsSort;
- BOOL delayContainedObjectSorting;
BOOL saveGroupingChanges;
BOOL expanded; //Exanded/Collapsed state of this object
@@ -63,7 +62,4 @@
*/
- (NSArray *)listContactsIncludingOfflineAccounts;
-//Delay sorting the contained object list; this should only be used by the contactController. Be sure to set it back to YES when operations are done
-- (void)setDelayContainedObjectSorting:(BOOL)flag;
-
@end
diff -r 4a7a1638b23f -r 4a8924478c80 Frameworks/Adium Framework/Source/AIMetaContact.m
--- a/Frameworks/Adium Framework/Source/AIMetaContact.m Fri May 29 20:27:20 2009 -0400
+++ b/Frameworks/Adium Framework/Source/AIMetaContact.m Fri May 29 17:03:32 2009 -0700
@@ -66,7 +66,6 @@
containsOnlyOneUniqueContact = NO;
containsOnlyOneService = YES;
containedObjectsNeedsSort = NO;
- delayContainedObjectSorting = NO;
saveGroupingChanges = YES;
}
return self;
@@ -873,7 +872,7 @@
- (NSArray *)containedObjects
{
//Sort the containedObjects if the flag tells us it's needed
- if (containedObjectsNeedsSort && !delayContainedObjectSorting) {
+ if (containedObjectsNeedsSort) {
containedObjectsNeedsSort = NO;
[_containedObjects sortUsingFunction:containedContactSort context:self];
}
@@ -888,7 +887,7 @@
//Test for the presence of an object in our group
- (BOOL)containsObject:(AIListObject *)inObject
{
- return [self.containedObjects containsObject:inObject];
+ return [_containedObjects containsObject:inObject];
}
//Retrieve an object by index
@@ -937,11 +936,6 @@
return !containsOnlyOneUniqueContact;
}
-- (float)orderIndexForObject:(AIListObject *)listObject
-{
- return [super orderIndexForObject:listObject];
-}
-
- (void)listObject:(AIListObject *)listObject didSetOrderIndex:(float)inOrderIndex
{
[super listObject:listObject didSetOrderIndex:inOrderIndex];
@@ -959,15 +953,6 @@
#pragma mark Contained Contact sorting
-- (void)setDelayContainedObjectSorting:(BOOL)flag
-{
- delayContainedObjectSorting = flag;
-
- if (!delayContainedObjectSorting) {
- [self containedObjectsOrOrderDidChange];
- }
-}
-
/*!
* @brief Sort contained contacts, first by order index and then by internalUniqueObjectID
*/
diff -r 4a7a1638b23f -r 4a8924478c80 Plugins/Status Menu Item/CBStatusMenuItemController.m
--- a/Plugins/Status Menu Item/CBStatusMenuItemController.m Fri May 29 20:27:20 2009 -0400
+++ b/Plugins/Status Menu Item/CBStatusMenuItemController.m Fri May 29 17:03:32 2009 -0700
@@ -531,12 +531,8 @@
*/
- (void)contactMenu:(AIContactMenu *)inContactMenu didSelectContact:(AIListContact *)inContact
{
- if ([inContact isMemberOfClass:[AIListBookmark class]]) {
- [(AIListBookmark *)inContact openChat];
- } else {
- [adium.interfaceController setActiveChat:[adium.chatController openChatWithContact:inContact
- onPreferredAccount:YES]];
- }
+ [adium.interfaceController setActiveChat:[adium.chatController openChatWithContact:inContact
+ onPreferredAccount:YES]];
[self activateAdium];
}
diff -r 4a7a1638b23f -r 4a8924478c80 Source/AIChatController.m
--- a/Source/AIChatController.m Fri May 29 20:27:20 2009 -0400
+++ b/Source/AIChatController.m Fri May 29 17:03:32 2009 -0700
@@ -18,6 +18,7 @@
#import <Adium/AIContentObject.h>
#import <Adium/AIContentMessage.h>
#import <Adium/AIListContact.h>
+#import <Adium/AIListBookmark.h>
#import <Adium/AIMetaContact.h>
#import <Adium/AIService.h>
#import <AIUtilities/AIArrayAdditions.h>
@@ -245,14 +246,15 @@
*/
- (AIChat *)openChatWithContact:(AIListContact *)inContact onPreferredAccount:(BOOL)onPreferredAccount
{
- AIChat *chat;
+ if ([inContact isKindOfClass:[AIListBookmark class]])
+ return [(AIListBookmark *)inContact openChat];
if (onPreferredAccount) {
inContact = [adium.contactController preferredContactForContentType:CONTENT_MESSAGE_TYPE
forListContact:inContact];
}
- chat = [self chatWithContact:inContact];
+ AIChat *chat = [self chatWithContact:inContact];
if (chat) [adium.interfaceController openChat:chat];
return chat;
diff -r 4a7a1638b23f -r 4a8924478c80 Source/AIListController.m
--- a/Source/AIListController.m Fri May 29 20:27:20 2009 -0400
+++ b/Source/AIListController.m Fri May 29 17:03:32 2009 -0700
@@ -810,15 +810,9 @@
[mutableString appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
[attachment release];
}
-
- AIChat *chat = nil;
-
- if ([item.listObject isKindOfClass:[AIListBookmark class]]) {
- chat = [item.listObject openChat];
- } else {
- chat = [adium.chatController openChatWithContact:(AIListContact *)(item.listObject)
- onPreferredAccount:YES];
- }
+
+ AIChat *chat = [adium.chatController openChatWithContact:(AIListContact *)(item.listObject)
+ onPreferredAccount:YES];
[chat.chatContainer.messageViewController addToTextEntryView:mutableString];
@@ -852,14 +846,8 @@
}
if(messageAttributedString && [messageAttributedString length] !=0) {
- AIChat *chat = nil;
-
- if ([item.listObject isKindOfClass:[AIListBookmark class]]) {
- chat = [item.listObject openChat];
- } else {
- chat = [adium.chatController openChatWithContact:(AIListContact *)(item.listObject)
- onPreferredAccount:YES];
- }
+ AIChat *chat = [adium.chatController openChatWithContact:(AIListContact *)(item.listObject)
+ onPreferredAccount:YES];
[chat.chatContainer.messageViewController addToTextEntryView:messageAttributedString];
More information about the commits
mailing list