adium 5455:315d12906aa9: Some cleanup refs #14468.

commits at adium.im commits at adium.im
Thu May 2 00:20:46 UTC 2013


details:	http://hg.adium.im/adium/rev/315d12906aa9
revision:	5455:315d12906aa9
branch:		adium-1.6
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Thu May 02 02:20:21 2013 +0200

Some cleanup refs #14468.

diffs (58 lines):

diff -r 23bcaaa007a0 -r 315d12906aa9 Frameworks/Adium Framework/Source/AIGroupChat.h
--- a/Frameworks/Adium Framework/Source/AIGroupChat.h	Thu May 02 01:16:18 2013 +0200
+++ b/Frameworks/Adium Framework/Source/AIGroupChat.h	Thu May 02 02:20:21 2013 +0200
@@ -18,7 +18,7 @@
 
 @interface AIGroupChat : AIChat <AIContainingObject> {
 	NSString			*topic;
-    AIListContact		*topicSetter;
+    NSString			*topicSetter;
 	
 	NSMutableDictionary	*participatingNicksFlags;
 	NSMutableDictionary	*participatingNicksContacts;
@@ -40,12 +40,6 @@
 @property (readwrite, copy, nonatomic) NSDate *lastMessageDate;
 
 // Group chat participants.
-//- (NSString *)displayNameForContact:(AIListObject *)contact;
-//- (AIGroupChatFlags)flagsForContact:(AIListObject *)contact;
-//- (NSString *)aliasForContact:(AIListObject *)contact;
-//- (void)setFlags:(AIGroupChatFlags)flags forContact:(AIListObject *)contact;
-//- (void)setAlias:(NSString *)alias forContact:(AIListObject *)contact;
-
 - (AIListContact *)contactForNick:(NSString *)nick;
 - (AIGroupChatFlags)flagsForNick:(NSString *)nick;
 - (void)setFlags:(AIGroupChatFlags)flags forNick:(NSString *)nick;
diff -r 23bcaaa007a0 -r 315d12906aa9 Frameworks/Adium Framework/Source/AIGroupChat.m
--- a/Frameworks/Adium Framework/Source/AIGroupChat.m	Thu May 02 01:16:18 2013 +0200
+++ b/Frameworks/Adium Framework/Source/AIGroupChat.m	Thu May 02 02:20:21 2013 +0200
@@ -430,7 +430,7 @@
 
 - (void)removeObjectAfterAccountStopsTracking:(NSString *)object
 {
-	assert(FALSE);
+	[self removeObject:object];
 }
 
 - (void)removeAllParticipatingContactsSilently
diff -r 23bcaaa007a0 -r 315d12906aa9 Plugins/Dual Window Interface/AIMessageViewController.m
--- a/Plugins/Dual Window Interface/AIMessageViewController.m	Thu May 02 01:16:18 2013 +0200
+++ b/Plugins/Dual Window Interface/AIMessageViewController.m	Thu May 02 02:20:21 2013 +0200
@@ -67,7 +67,7 @@
 - (void)setUserListVisible:(BOOL)inVisible animate:(BOOL)useAnimation;
 - (void)updateUserCount;
 
-- (NSArray *)contactsMatchingBeginningString:(NSString *)partialWord;
+- (NSArray *)nicksMatchingBeginningString:(NSString *)partialWord;
 
 - (void)alertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
 - (void)gotFilteredMessageToSendLater:(NSAttributedString *)filteredMessage receivingContext:(NSMutableDictionary *)alertDict;
@@ -803,7 +803,7 @@
 #pragma mark Autocompletion
 - (BOOL)canTabCompleteForPartialWord:(NSString *)partialWord
 {
-	return ([self contactsMatchingBeginningString:partialWord].count > 0 ||
+	return ([self nicksMatchingBeginningString:partialWord].count > 0 ||
 			[self.chat.displayName rangeOfString:partialWord options:(NSDiacriticInsensitiveSearch | NSCaseInsensitiveSearch | NSAnchoredSearch)].location != NSNotFound);
 }
 




More information about the commits mailing list