adium/adium

ARCify the changes in the previous merge.

2013-02-24, Thijs Alkemade
7bf5466e8548
Parents 039bdad0308c
Children ca5229914ebc
ARCify the changes in the previous merge.
5 files changed, 3 insertions(+), 8 deletions(-)
  • +0 -1
    Frameworks/Adium Framework/Source/AISoundSet.m
  • +0 -2
    Plugins/Dual Window Interface/AIMessageViewController.m
  • +1 -1
    Plugins/Dual Window Interface/AIMessageWindowController.m
  • +2 -2
    Source/AILogViewerWindowController.m
  • +0 -2
    Source/AIPreferenceWindowController.m
    • --- a/Frameworks/Adium Framework/Source/AISoundSet.m Sat Feb 23 23:03:59 2013 +0100
    +++ b/Frameworks/Adium Framework/Source/AISoundSet.m Sun Feb 24 00:02:34 2013 +0100
    @@ -57,7 +57,6 @@
    if ((self = [super init])) {
    //Return nil if we can't load our sound set
    if (!inPath || ![inPath length] || ![self _loadSoundSetFromPath:inPath]) {
    - [self release];
    return nil;
    }
    --- a/Plugins/Dual Window Interface/AIMessageViewController.m Sat Feb 23 23:03:59 2013 +0100
    +++ b/Plugins/Dual Window Interface/AIMessageViewController.m Sun Feb 24 00:02:34 2013 +0100
    @@ -1439,8 +1439,6 @@
    ![chat boolValueForProperty:@"accountJoined"]) {
    AIRejoinGroupChatViewController *rejoinChatController = [[AIRejoinGroupChatViewController alloc] init];
    [self addTopBarController:rejoinChatController];
    -
    - [rejoinChatController release];
    }
    }
    --- a/Plugins/Dual Window Interface/AIMessageWindowController.m Sat Feb 23 23:03:59 2013 +0100
    +++ b/Plugins/Dual Window Interface/AIMessageWindowController.m Sun Feb 24 00:02:34 2013 +0100
    @@ -662,7 +662,7 @@
    AIChat *chat = inTabViewItem.chat;
    if ([self.containedChats indexOfObject:chat] != idx) {
    - NSMutableArray *cells = [[[tabView_tabBar cells] mutableCopy] autorelease];
    + NSMutableArray *cells = [[tabView_tabBar cells] mutableCopy];
    [cells moveObject:[cells objectAtIndex:[[tabView_tabBar representedTabViewItems] indexOfObject:inTabViewItem]] toIndex:idx];
    [tabView_tabBar setNeedsDisplay:YES];
    --- a/Source/AILogViewerWindowController.m Sat Feb 23 23:03:59 2013 +0100
    +++ b/Source/AILogViewerWindowController.m Sun Feb 24 00:02:34 2013 +0100
    @@ -120,7 +120,7 @@
    - (void)outlineViewSelectionDidChangeDelayed;
    - (void)openChatOnDoubleAction:(id)sender;
    -- (void)deleteLogsAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(NSArray *)__attribute__((ns_consumed)) contextInfo;
    +- (void)deleteLogsAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *) contextInfo;
    NSInteger compareRectLocation(id obj1, id obj2, void *context);
    - (void)setNavBarHidden:(NSNumber *)hide;
    @@ -2555,7 +2555,7 @@
    [self rebuildIndices];
    }
    -- (void)deleteLogsAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(NSArray *)__attribute__((ns_consumed)) contextInfo;
    +- (void)deleteLogsAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;
    {
    NSArray *selectedLogs = (__bridge NSArray *)contextInfo;
    if (returnCode == NSAlertFirstButtonReturn) {
    --- a/Source/AIPreferenceWindowController.m Sat Feb 23 23:03:59 2013 +0100
    +++ b/Source/AIPreferenceWindowController.m Sun Feb 24 00:02:34 2013 +0100
    @@ -516,8 +516,6 @@
    [_trackingAreas addObject:tA];
    y -= SUGGESTION_ENTRY_HEIGHT;
    -
    - [item release];
    }
    [suggestionsWindow setFrame:frame display:NO];