adium/adium

Some cleanup refs #14468.
adium-1.6
2013-05-02, Thijs Alkemade
315d12906aa9
Parents 23bcaaa007a0
Children 96a70c52c6eb
Some cleanup refs #14468.
3 files changed, 4 insertions(+), 10 deletions(-)
  • +1 -7
    Frameworks/Adium Framework/Source/AIGroupChat.h
  • +1 -1
    Frameworks/Adium Framework/Source/AIGroupChat.m
  • +2 -2
    Plugins/Dual Window Interface/AIMessageViewController.m
    • --- 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;
    --- 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
    --- 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);
    }