Changeset 2796

Show
Ignore:
Timestamp:
06/25/05 22:48:33 (3 years ago)
Author:
timothy
Message:
  • Fixed the Irssi "signedness" compile warnings. Please re-run Configure.command.
  • Made a ChatCore?.h file, that wil import all Chat Core headers. This mimics other frameworks.
  • Added the new ChatCore?.h header to Colloquy's prefix header file. Along with AddressBook?.h.
  • Removed all Chat Core header imports from other Colloquy source files, now that it is in the prefix header.
  • Added 2 delete buttons in the Interface preferences pane. Some users had trouble deleting, not knowing the Delete key worked.
  • Fixed the tooltips on the Interface preferences buttions. Fixes #212.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Chat Core.xcodeproj/project.pbxproj

    r2787 r2796  
    1616                1C5A233F06FA4FEE00A51F10 /* libsilc.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C5A233D06FA4FEE00A51F10 /* libsilc.framework */; }; 
    1717                1C5A234006FA4FEE00A51F10 /* libsilcclient.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1C5A233E06FA4FEE00A51F10 /* libsilcclient.framework */; }; 
     18                1C63E9ED086E59D700A40DD4 /* ChatCore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C63E9EC086E59D700A40DD4 /* ChatCore.h */; settings = {ATTRIBUTES = (Public, ); }; }; 
    1819                1C668DBA07BF9C4C008400F7 /* NSScannerAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1C668DB807BF9C4C008400F7 /* NSScannerAdditions.m */; }; 
    1920                1C668DBC07BF9C66008400F7 /* NSAttributedStringAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = F5E98623018B412B01EE70DE /* NSAttributedStringAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; }; 
    …… 
    206207                1C5CC07A06FFCB0B0006C5B1 /* MVChatRoom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVChatRoom.h; sourceTree = "<group>"; }; 
    207208                1C5CC07B06FFCB0B0006C5B1 /* MVChatRoom.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MVChatRoom.m; sourceTree = "<group>"; }; 
     209                1C63E9EC086E59D700A40DD4 /* ChatCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatCore.h; sourceTree = "<group>"; }; 
    208210                1C668DB707BF9C4C008400F7 /* NSScannerAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSScannerAdditions.h; sourceTree = "<group>"; }; 
    209211                1C668DB807BF9C4C008400F7 /* NSScannerAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSScannerAdditions.m; sourceTree = "<group>"; }; 
    …… 
    817819                                1C5CBF3006FF93550006C5B1 /* SILC Support */, 
    818820                                1CF6512A06EA22C40073DEA8 /* ChatCore.pch */, 
     821                                1C63E9EC086E59D700A40DD4 /* ChatCore.h */, 
    819822                                F52D043001873FC401EE70DE /* MVChatConnection.m */, 
    820823                                F52D043101873FC401EE70DE /* MVChatConnection.h */, 
    …… 
    888891                                1C668DC307BF9C6B008400F7 /* NSNotificationAdditions.h in Headers */, 
    889892                                1C7C776907DBBA4500FB5F83 /* NSScriptCommandAdditions.h in Headers */, 
     893                                1C63E9ED086E59D700A40DD4 /* ChatCore.h in Headers */, 
    890894                        ); 
    891895                        runOnlyForDeploymentPostprocessing = 0; 

  • trunk/Colloquy.pch

    r2676 r2796  
    33#import <Cocoa/Cocoa.h> 
    44#import <WebKit/WebKit.h> 
     5#import <AddressBook/AddressBook.h> 
    56#import <AGRegex/AGRegex.h> 
     7#import <ChatCore/ChatCore.h> 
    68 
    79#ifdef NSAppKitVersionNumber10_3 

  • trunk/Core/irssi/src/irc/core/irc-servers.c

    r2711 r2796  
    599599 
    600600        for (i = 0, item = chanmodes; *item != NULL && i < 4; item++, i++) { 
    601                 unsigned char *p = *item; 
     601                char *p = *item; 
    602602                while (*p != '\0') { 
    603603                        server->modes[(int)*p].func = modefuncs[i]; 

  • trunk/JVAppearancePreferences.m

    r2744 r2796  
    1 #import <ChatCore/NSColorAdditions.h> 
    2 #import <ChatCore/NSStringAdditions.h> 
    3  
    41#import "JVAppearancePreferences.h" 
    52#import "JVStyle.h" 

  • trunk/JVBuddy.h

    r2564 r2796  
    1 #import <ChatCore/MVChatUser.h> 
    2  
    31extern NSString *JVBuddyCameOnlineNotification; 
    42extern NSString *JVBuddyWentOfflineNotification; 

  • trunk/JVBuddy.m

    r2603 r2796  
    1 #import <AddressBook/AddressBook.h> 
    2 #import <ChatCore/MVChatConnection.h> 
    3 #import <ChatCore/NSStringAdditions.h> 
    4 #import <ChatCore/MVChatUser.h> 
    5  
    61#import "JVBuddy.h" 
    72#import "MVConnectionsController.h" 

  • trunk/JVBuddyInspector.m

    r2603 r2796  
    1 #import <ChatCore/MVChatConnection.h> 
    2 #import <ChatCore/NSStringAdditions.h> 
    3 #import <AddressBook/AddressBook.h> 
    4  
    51#import "MVConnectionsController.h" 
    62#import "JVBuddyInspector.h" 

  • trunk/JVChatConsolePanel.m

    r2687 r2796  
    1 #import <ChatCore/MVChatConnection.h> 
    2 #import <ChatCore/MVChatPluginManager.h> 
    3 #import <ChatCore/NSMethodSignatureAdditions.h> 
    4  
    51#import "JVChatConsolePanel.h" 
    62#import "JVChatController.h" 

  • trunk/JVChatController.m

    r2752 r2796  
    1 #import <ChatCore/MVChatConnection.h> 
    2 #import <ChatCore/MVChatRoom.h> 
    3 #import <ChatCore/MVChatUser.h> 
    4 #import <ChatCore/NSAttributedStringAdditions.h> 
    5  
    61#import "JVChatController.h" 
    72#import "MVConnectionsController.h" 

  • trunk/JVChatEvent.m

    r2558 r2796  
    22#import "NSAttributedStringMoreAdditions.h" 
    33 
    4 #import <ChatCore/NSAttributedStringAdditions.h> 
    5 #import <ChatCore/NSStringAdditions.h> 
    6 #import <ChatCore/NSDataAdditions.h> 
    74#import <libxml/xinclude.h> 
    85 

  • trunk/JVChatMemberInspector.m

    r2672 r2796  
    1 #import <ChatCore/MVChatConnection.h> 
    2 #import <ChatCore/MVChatUser.h> 
    3 #import <ChatCore/MVChatRoom.h> 
    41#import "JVChatMemberInspector.h" 
    52#import "JVChatRoomPanel.h" 

  • trunk/JVChatMessage.m

    r2710 r2796  
    1 #import <ChatCore/MVChatUser.h> 
    2 #import <ChatCore/NSAttributedStringAdditions.h> 
    3 #import <ChatCore/NSStringAdditions.h> 
    4 #import <ChatCore/NSDataAdditions.h> 
    51#import <libxml/xinclude.h> 
    62 

  • trunk/JVChatRoomBrowser.m

    r2603 r2796  
    1 #import <ChatCore/MVChatConnection.h> 
    2 #import <ChatCore/NSAttributedStringAdditions.h> 
    3  
    41#import "JVChatRoomBrowser.h" 
    52#import "JVChatController.h" 

  • trunk/JVChatRoomInspector.m

    r2558 r2796  
    33#import "JVDirectChatPanel.h" 
    44#import "JVChatTranscriptPanel.h" 
    5 #import <ChatCore/MVChatConnection.h> 
    6 #import <ChatCore/MVChatRoom.h> 
    7 #import <ChatCore/NSAttributedStringAdditions.h> 
    85 
    96@interface JVChatTranscriptPanel (JVChatTranscriptPrivate) 

  • trunk/JVChatRoomMember.m

    r2694 r2796  
    1 #import <AddressBook/AddressBook.h> 
    2 #import <ChatCore/MVChatConnection.h> 
    3 #import <ChatCore/MVChatRoom.h> 
    4 #import <ChatCore/MVChatUser.h> 
    5 #import <ChatCore/NSDataAdditions.h> 
    6 #import <ChatCore/NSStringAdditions.h> 
    7  
    81#import "JVChatRoomPanel.h" 
    92#import "JVChatRoomMember.h" 

  • trunk/JVChatRoomPanel.m

    r2754 r2796  
    1 #import <ChatCore/MVChatConnection.h> 
    2 #import <ChatCore/MVChatRoom.h> 
    3 #import <ChatCore/MVChatUser.h> 
    4 #import <ChatCore/MVChatPluginManager.h> 
    5 #import <ChatCore/NSStringAdditions.h> 
    6 #import <ChatCore/NSAttributedStringAdditions.h> 
    7 #import <ChatCore/NSMethodSignatureAdditions.h> 
    8  
    91#import "JVChatController.h" 
    102#import "JVTabbedChatWindowController.h" 
    …… 
    644636        [list addObject:NSToolbarFlexibleSpaceItemIdentifier]; 
    645637        [list addObject:JVToolbarMarkItemIdentifier]; 
    646         [list addObject:JVToolbarClearItemIdentifier]; 
     638        [list addObject:JVToolbarClearScrollbackItemIdentifier]; 
    647639        [list addObject:NSToolbarSeparatorItemIdentifier]; 
    648640        [list addObject:JVToolbarQuickSearchItemIdentifier]; 

  • trunk/JVChatTranscript.m

    r2678 r2796  
    44#import "JVChatEvent.h" 
    55#import "KAIgnoreRule.h" 
    6  
    7 #import <ChatCore/MVChatUser.h> 
    8 #import <ChatCore/NSStringAdditions.h> 
    9 #import <ChatCore/NSDataAdditions.h> 
    10 #import <ChatCore/NSAttributedStringAdditions.h> 
    116 
    127#import <libxml/xinclude.h> 

  • trunk/JVChatTranscriptPanel.m

    r2755 r2796  
    11#import "JVChatTranscriptPanel.h" 
    2  
    3 #import <ChatCore/MVChatConnection.h> 
    4 #import <ChatCore/MVChatPluginManager.h> 
    5 #import <ChatCore/NSMethodSignatureAdditions.h> 
    6 #import <ChatCore/NSStringAdditions.h> 
    72 
    83#import "JVTranscriptFindWindowController.h" 

  • trunk/JVChatViewCriterionController.m

    r2739 r2796  
    1 #import <ChatCore/MVChatConnection.h> 
    21#import "JVChatViewCriterionController.h" 
    32#import "JVChatRoomPanel.h" 

  • trunk/JVChatWindowController.m

    r2752 r2796  
    1 #import <ChatCore/MVChatPluginManager.h> 
    2 #import <ChatCore/NSMethodSignatureAdditions.h> 
    31#import "JVChatWindowController.h" 
    42#import "MVConnectionsController.h" 

  • trunk/JVColorWellCell.m

    r2558 r2796  
    1 #import <ChatCore/NSColorAdditions.h> 
    21#import "JVColorWellCell.h" 
    32 

  • trunk/JVConnectionInspector.h

    r2308 r2796  
    22#import "JVInspectorController.h" 
    33#import "JVChatConsolePanel.h" 
    4  
    54 
    65@interface MVChatConnection (MVChatConnectionInspection) <JVInspection> 

  • trunk/JVDirectChatPanel.h

    r2595 r2796  
    99 
    1010extern NSString *JVToolbarTextEncodingItemIdentifier; 
    11 extern NSString *JVToolbarClearItemIdentifier; 
     11extern NSString *JVToolbarClearScrollbackItemIdentifier; 
    1212extern NSString *JVToolbarSendFileItemIdentifier; 
    1313extern NSString *JVToolbarMarkItemIdentifier; 

  • trunk/JVDirectChatPanel.m

    r2760 r2796  
    1 #import <AddressBook/AddressBook.h> 
    2  
    3 #import <ChatCore/MVChatConnection.h> 
    4 #import <ChatCore/MVChatUser.h> 
    5 #import <ChatCore/MVChatRoom.h> 
    6 #import <ChatCore/MVChatPluginManager.h> 
    7 #import <ChatCore/NSAttributedStringAdditions.h> 
    8 #import <ChatCore/NSStringAdditions.h> 
    9 #import <ChatCore/NSDataAdditions.h> 
    10 #import <ChatCore/NSMethodSignatureAdditions.h> 
    11 #import <ChatCore/NSColorAdditions.h> 
    12 #import <ChatCore/NSScriptCommandAdditions.h> 
    13  
    141#import "JVChatController.h" 
    152#import "KAIgnoreRule.h" 
    …… 
    9784 
    9885NSString *JVToolbarTextEncodingItemIdentifier = @"JVToolbarTextEncodingItem"; 
    99 NSString *JVToolbarClearItemIdentifier = @"JVToolbarClearItem"; 
     86NSString *JVToolbarClearScrollbackItemIdentifier = @"JVToolbarClearScrollbackItem"; 
    10087NSString *JVToolbarSendFileItemIdentifier = @"JVToolbarSendFileItem"; 
    10188NSString *JVToolbarMarkItemIdentifier = @"JVToolbarMarkItem"; 
    …… 
    12571244 
    12581245                [toolbarItem setMenuFormRepresentation:menuItem]; 
    1259         } else if( [identifier isEqual:JVToolbarClearItemIdentifier] ) { 
     1246        } else if( [identifier isEqual:JVToolbarClearScrollbackItemIdentifier] ) { 
    12601247                toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier:identifier] autorelease]; 
    12611248 
    …… 
    13011288                [list addObject:NSToolbarFlexibleSpaceItemIdentifier]; 
    13021289                [list addObject:JVToolbarMarkItemIdentifier]; 
    1303                 [list addObject:JVToolbarClearItemIdentifier]; 
     1290                [list addObject:JVToolbarClearScrollbackItemIdentifier]; 
    13041291                [list addObject:NSToolbarSeparatorItemIdentifier]; 
    13051292                [list addObject:JVToolbarQuickSearchItemIdentifier]; 
    …… 
    13121299        if( [self isMemberOfClass:[JVDirectChatPanel class]] ) [list addObject:JVToolbarSendFileItemIdentifier]; 
    13131300        [list addObject:JVToolbarTextEncodingItemIdentifier]; 
    1314         [list addObject:JVToolbarClearItemIdentifier]; 
     1301        [list addObject:JVToolbarClearScrollbackItemIdentifier]; 
    13151302        [list addObject:JVToolbarMarkItemIdentifier]; 
    13161303        return list; 

  • trunk/JVEmoticonSet.m

    r2724 r2796  
    11#import "JVEmoticonSet.h" 
    22#import "NSBundleAdditions.h" 
    3  
    4 #import <ChatCore/NSStringAdditions.h> 
    53 
    64@interface JVEmoticonSet (JVEmoticonSetPrivate) 

  • trunk/JVFileTransferPreferences.m

    r2744 r2796  
    1 #import <ChatCore/MVFileTransfer.h> 
    21#import "JVFileTransferPreferences.h" 
    32#import "MVFileTransferController.h" 

  • trunk/JVInterfacePreferences.h

    r2744 r2796  
    44        IBOutlet NSTableView *windowSetsTable; 
    55        IBOutlet NSTableView *rulesTable; 
     6        IBOutlet NSButton *deleteWindowButton; 
    67        IBOutlet NSButton *editWindowButton; 
     8        IBOutlet NSButton *deleteRuleButton; 
    79        IBOutlet NSButton *editRuleButton; 
    810        IBOutlet NSPopUpButton *drawerSide; 
    …… 
    4547- (IBAction) changeSortByStatus:(id) sender; 
    4648- (IBAction) changeShowFullRoomName:(id) sender; 
     49 
     50- (void) clear:(id) sender; 
    4751@end 

  • trunk/JVInterfacePreferences.m

    r2743 r2796  
    1 #import <ChatCore/NSStringAdditions.h> 
    21#import "JVInterfacePreferences.h" 
    32#import "JVChatViewCriterionController.h" 
    …… 
    190189                NSDictionary *info = [_windowSets objectAtIndex:_selectedWindowSet]; 
    191190                [editWindowButton setEnabled:( ! [[info objectForKey:@"currentWindow"] boolValue] )]; 
     191                [deleteWindowButton setEnabled:( ! [[info objectForKey:@"currentWindow"] boolValue] )]; 
    192192                [rulesTable reloadData]; 
    193193        } else if( view == rulesTable ) { 
    194194                _selectedRuleSet = [[rulesTable selectedRowIndexes] firstIndex]; 
    195195                [editRuleButton setEnabled:( _selectedRuleSet != NSNotFound )]; 
     196                [deleteRuleButton setEnabled:( _selectedRuleSet != NSNotFound )]; 
    196197        } else if( view == ruleEditTable ) { 
    197198                [ruleEditTable deselectAll:nil];         
    …… 
    251252 
    252253- (void) clear:(id) sender { 
    253         if( sender == windowSetsTable ) { 
     254        if( sender == windowSetsTable || sender == deleteWindowButton ) { 
    254255                NSDictionary *info = [_windowSets objectAtIndex:_selectedWindowSet]; 
    255256                if( [[info objectForKey:@"currentWindow"] boolValue] ) { 
    …… 
    266267                info = [_windowSets objectAtIndex:_selectedWindowSet]; 
    267268                [editWindowButton setEnabled:( ! [[info objectForKey:@"currentWindow"] boolValue] )]; 
     269                [deleteWindowButton setEnabled:( ! [[info objectForKey:@"currentWindow"] boolValue] )]; 
    268270 
    269271                [self saveWindowRules]; 
    270         } else if( sender == rulesTable ) { 
     272        } else if( sender == rulesTable || sender == deleteRuleButton ) { 
    271273                [[self selectedRules] removeObjectAtIndex:_selectedRuleSet]; 
    272274 
    …… 
    276278                _selectedRuleSet = [[rulesTable selectedRowIndexes] firstIndex]; 
    277279                [editRuleButton setEnabled:( _selectedRuleSet != NSNotFound )]; 
     280                [deleteRuleButton setEnabled:( _selectedRuleSet != NSNotFound )]; 
    278281 
    279282                [self saveWindowRules]; 

  • trunk/JVNotificationController.m

    r2795 r2796  
    1 #import <ChatCore/MVChatPluginManager.h> 
    2 #import <ChatCore/NSMethodSignatureAdditions.h> 
    31#import <Growl/GrowlApplicationBridge.h> 
    42#import "JVNotificationController.h" 

  • trunk/JVSmartTranscriptPanel.m

    r2650 r2796  
    419419                [toolbarItem setTarget:self]; 
    420420                [toolbarItem setAction:@selector( editSettings: )]; 
    421         } else if( [identifier isEqual:JVToolbarClearItemIdentifier] ) { 
     421        } else if( [identifier isEqual:JVToolbarClearScrollbackItemIdentifier] ) { 
    422422                toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier:identifier] autorelease]; 
    423423 
    …… 
    444444        NSMutableArray *list = [NSMutableArray arrayWithArray:[super toolbarAllowedItemIdentifiers:toolbar]]; 
    445445        [list addObject:JVToolbarRuleSettingsItemIdentifier]; 
    446         [list addObject:JVToolbarClearItemIdentifier]; 
     446        [list addObject:JVToolbarClearScrollbackItemIdentifier]; 
    447447        return list; 
    448448} 

  • trunk/JVStyleView.m

    r2696 r2796  
    55#import "JVStyle.h" 
    66#import "JVEmoticonSet.h" 
    7  
    8 #import <ChatCore/NSStringAdditions.h> 
    9 #import <ChatCore/NSNotificationAdditions.h> 
    107 
    118NSString *JVStyleViewDidChangeStylesNotification = @"JVStyleViewDidChangeStylesNotification"; 

  • trunk/JVTabbedChatWindowController.m

    r2742 r2796  
    1 #import <ChatCore/MVChatPluginManager.h> 
    2 #import <ChatCore/NSMethodSignatureAdditions.h> 
    31#import "JVChatController.h" 
    42#import "JVTabbedChatWindowController.h" 

  • trunk/JVTranscriptCriterionController.m

    r2740 r2796  
    22// Created by Timothy Hatcher for Colloquy. 
    33// Copyright Joar Wingfors and Timothy Hatcher. All rights reserved. 
    4  
    5 #import <ChatCore/MVChatConnection.h> 
    6 #import <ChatCore/MVChatUser.h> 
    74 
    85#import "JVTranscriptCriterionController.h" 

  • trunk/KAIgnoreRule.m

    r2344 r2796  
    44 
    55#import "KAIgnoreRule.h" 
    6 #import <ChatCore/MVChatConnection.h> 
    7 #import <ChatCore/MVChatUser.h> 
    86#import "JVChatWindowController.h" 
    97#import "JVDirectChatPanel.h" 

  • trunk/Languages/English.lproj/JVInterfacePreferences.nib/classes.nib

    r2744 r2796  
    1111                changeShowFullRoomName = id;  
    1212                changeSortByStatus = id;  
     13                clear = id;  
    1314                editRuleSet = id;  
    1415                editWindowSet = id;  
    …… 
    2021            LANGUAGE = ObjC;  
    2122            OUTLETS = { 
     23                deleteRuleButton = NSButton;  
     24                deleteWindowButton = NSButton;  
    2225                drawerSide = NSPopUpButton;  
    2326                editRuleButton = NSButton;  

  • trunk/Languages/English.lproj/JVInterfacePreferences.nib/info.nib

    r2744 r2796  
    44<dict> 
    55        <key>IBDocumentLocation</key> 
    6         <string>64 446 356 240 0 0 1280 832 </string> 
     6        <string>22 572 356 240 0 0 1344 986 </string> 
    77        <key>IBEditorPositions</key> 
    88        <dict> 
    99                <key>5</key> 
    10                 <string>367 359 545 421 0 0 1280 832 </string> 
     10                <string>378 301 545 421 0 0 1344 986 </string> 
    1111        </dict> 
    1212        <key>IBFramework Version</key> 
    13         <string>437.0</string> 
     13        <string>439.0</string> 
    1414        <key>IBLockedObjects</key> 
    1515        <array> 
    …… 
    2222        </array> 
    2323        <key>IBSystem Version</key> 
    24         <string>8B15</string> 
     24        <string>8C31</string> 
    2525</dict> 
    2626</plist> 

  • trunk/MVApplicationController.m

    r2761 r2796  
    1 #import <ChatCore/MVChatPluginManager.h> 
    2 #import <ChatCore/NSMethodSignatureAdditions.h> 
    3 #import <ChatCore/NSColorAdditions.h> 
    41#import "NSURLAdditions.h" 
    52#import "MVColorPanel.h" 
    …… 
    2118#import "MVBuddyListController.h" 
    2219#import "JVChatController.h" 
    23 #import "MVChatConnection.h" 
    2420#import "JVChatRoomBrowser.h" 
    2521#import "NSBundleAdditions.h" 

  • trunk/MVBuddyListController.m

    r2793 r2796  
    1 #import <AddressBook/AddressBook.h> 
    2 #import <ChatCore/MVChatConnection.h> 
    3 #import <ChatCore/NSStringAdditions.h> 
    4 #import <ChatCore/MVChatPluginManager.h> 
    5 #import <ChatCore/NSMethodSignatureAdditions.h> 
    6  
    71#import "MVBuddyListController.h" 
    82#import "JVBuddy.h" 

  • trunk/MVChatUserAdditions.m

    r2299 r2796  
    11#import "MVChatUserAdditions.h" 
    2 #import <ChatCore/NSDataAdditions.h> 
    3 #import <ChatCore/NSStringAdditions.h> 
    42 
    53@implementation MVChatUser (MVChatUserAdditions) 

  • trunk/MVConnectionsController.m

    r2688 r2796  
    1 #import <ChatCore/MVChatConnection.h> 
    2 #import <ChatCore/NSMethodSignatureAdditions.h> 
    3 #import <ChatCore/NSStringAdditions.h> 
    4  
    51#import "MVConnectionsController.h" 
    62#import "JVConnectionInspector.h" 
    73#import "JVNotificationController.h" 
    8 #import "MVChatPluginManager.h" 
    94#import "JVChatController.h" 
    105#import "JVChatRoomBrowser.h" 

  • trunk/MVCrashCatcher.m

    r1823 r2796  
    1 #import <AddressBook/AddressBook.h> 
    2 #import <ChatCore/NSStringAdditions.h> 
    31#import "MVCrashCatcher.h" 
    42 

  • trunk/MVFileTransferController.m

    r2793 r2796  
    1 #import <ChatCore/MVChatConnection.h> 
    2 #import <ChatCore/MVFileTransfer.h> 
    3 #import <WebKit/WebDownload.h> 
    4  
    51#import "MVFileTransferController.h" 
    62#import "MVBuddyListController.h" 

  • trunk/MVSoftwareUpdate.m

    r2603 r2796  
    1 #import <unistd.h> 
    21#import "MVSoftwareUpdate.h" 
    32#import "MVFileTransferController.h" 
    4 #import <ChatCore/NSStringAdditions.h> 
    53 
    64#define MVSoftwareUpdateURLFormat @"http://colloquy.info/update.php?MVApplicationBuild=%@&MVApplicationName=%@" 
    7  
    8 #pragma mark - 
    95 
    106static jmp_buf timeoutJump; 
    …… 
    2824        signal( SIGALRM, oldTimeoutHandler ); 
    2925} 
     26 
     27#pragma mark - 
    3028 
    3129@implementation MVSoftwareUpdate 

  • trunk/NSAttributedStringMoreAdditions.m

    r2706 r2796  
    33// Copyright Graham Booker and Timothy Hatcher. All rights reserved. 
    44 
    5 #import <ChatCore/NSAttributedStringAdditions.h> 
    6 #import <ChatCore/NSStringAdditions.h> 
    7 #import <ChatCore/NSColorAdditions.h> 
    85#import <libxml/xinclude.h> 
    96#import "NSAttributedStringMoreAdditions.h" 

  • trunk/NSImageAdditions.m

    r2558 r2796  
    11#import "NSImageAdditions.h" 
    2 #import <ChatCore/NSDataAdditions.h> 
    32 
    43@implementation NSImage (NSImageAdditions) 

  • trunk/NSNotificationAdditions.h

    r1829 r2796  
    1 @interface NSNotificationCenter (NSNotificationAdditions) 
     1@interface NSNotificationCenter (NSNotificationCenterAdditions) 
    22- (void) postNotificationOnMainThread:(NSNotification *) notification; 
    33- (void) postNotificationOnMainThread:(NSNotification *) notification waitUntilDone:(BOOL) wait; 
    44@end 
    55 
    6 @interface NSNotificationQueue (NSNotificationAdditions) 
     6@interface NSNotificationQueue (NSNotificationQueueAdditions) 
    77- (void) enqueueNotificationOnMainThread:(NSNotification *) notification postingStyle:(NSPostingStyle) postingStyle; 
    88- (void) enqueueNotificationOnMainThread:(NSNotification *) notification postingStyle:(NSPostingStyle) postingStyle coalesceMask:(unsigned) coalesceMask forModes:(NSArray *) modes;