Changeset 3778

Show
Ignore:
Timestamp:
03/06/08 20:50:50 (7 months ago)
Author:
timothy
Message:

Build fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Chat Core.xcodeproj/project.pbxproj

    r3776 r3778  
    44        classes = { 
    55        }; 
    6         objectVersion = 44; 
     6        objectVersion = 45; 
    77        objects = { 
    88 

  • trunk/Chat Core/InterThreadMessaging.m

    r3713 r3778  
    2121        return useSystemVersion; 
    2222} 
     23 
     24#if !defined(TARGET_OS_ASPEN) || !TARGET_OS_ASPEN 
    2325 
    2426#import <pthread.h> 
    …… 
    7678} 
    7779 
     80#endif 
     81 
    7882@implementation NSThread (InterThreadMessaging) 
    7983+ (void) prepareForInterThreadMessages { 
     84#if !defined(TARGET_OS_ASPEN) || !TARGET_OS_ASPEN 
    8085        if(useSystemThreadPerformSelector()) 
    8186                return; 
    8287        [InterThreadManager class]; // Force the class initialization. 
    8388        createMessagePortForThread([NSThread currentThread], [NSRunLoop currentRunLoop]); 
     89#endif 
    8490} 
    8591@end 
     92 
     93#if !defined(TARGET_OS_ASPEN) || !TARGET_OS_ASPEN 
    8694 
    8795@implementation InterThreadManager 
    …… 
    114122@end 
    115123 
     124#endif 
     125 
    116126static void performSelector(SEL selector, id receiver, id object, NSThread *thread, BOOL wait) { 
    117127        if( ! thread || [thread isEqual:[NSThread currentThread]] ) { 
    …… 
    125135        } 
    126136 
     137#ifndef TARGET_OS_ASPEN 
    127138        InterThreadMessage *msg = (InterThreadMessage *)malloc(sizeof(struct InterThreadMessage)); 
    128139        bzero(msg, sizeof(struct InterThreadMessage)); 
    …… 
    142153        [components release]; 
    143154        [data release]; 
     155#endif 
    144156} 
    145157 

  • trunk/Chat Core/MVChatConnection.h

    r3722 r3778  
    146146@property NSStringEncoding encoding; 
    147147 
    148 @property(bycopy) NSString *realName; 
    149  
    150 @property(bycopy) NSString *nickname; 
     148@property(copy) NSString *realName; 
     149 
     150@property(copy) NSString *nickname; 
    151151@property(readonly) NSString *preferredNickname; 
    152152 
    153 @property(bycopy) NSArray *alternateNicknames; 
     153@property(copy) NSArray *alternateNicknames; 
    154154@property(readonly) NSString *nextAlternateNickname; 
    155155 
    156 @property(bycopy) NSString *nicknamePassword; 
     156@property(copy) NSString *nicknamePassword; 
    157157 
    158158@property(readonly) NSString *certificateServiceName; 
    159159@property(readonly) NSString *certificatePassword; 
    160160 
    161 @property(bycopy) NSString *password; 
    162  
    163 @property(bycopy) NSString *username; 
    164  
    165 @property(bycopy) NSString *server; 
     161@property(copy) NSString *password; 
     162 
     163@property(copy) NSString *username; 
     164 
     165@property(copy) NSString *server; 
    166166 
    167167@property unsigned short serverPort; 
    …… 
    169169@property MVChatMessageFormat outgoingChatFormat; 
    170170 
    171 @property(bycopy) NSString *proxyUsername; 
    172  
    173 @property(bycopy) NSString *proxyPassword; 
    174  
    175 @property BOOL secure; 
    176  
    177 @property(bycopy) NSDictionary *persistentInformation; 
     171@property(copy) NSString *proxyUsername; 
     172 
     173@property(copy) NSString *proxyPassword; 
     174 
     175@property(getter=isSecure) BOOL secure; 
     176 
     177@property(copy) NSDictionary *persistentInformation; 
    178178 
    179179@property MVChatConnectionProxy proxyType; 
    180180 
    181 @property(bycopy) NSString *proxyServer; 
     181@property(copy) NSString *proxyServer; 
    182182 
    183183@property unsigned short proxyServerPort; 
    …… 
    191191@property(readonly) NSSet *chatUserWatchRules; 
    192192 
    193 @property(bycopy) MVChatString *awayStatusMessage; 
    194  
    195 @property(readonly) BOOL connected; 
    196 @property(readonly) BOOL waitingToReconnect; 
     193@property(copy) MVChatString *awayStatusMessage; 
     194 
     195@property(readonly, getter=isConnected) BOOL connected; 
     196@property(readonly, getter=isWaitingToReconnect) BOOL waitingToReconnect; 
    197197@property(readonly) MVChatConnectionStatus status; 
    198198@property(readonly) unsigned int lag; 

  • trunk/Chat Core/MVChatConnection.m

    r3727 r3778  
    140140                _localUser = nil; 
    141141 
     142#if !defined(TARGET_OS_ASPEN) || !TARGET_OS_ASPEN 
    142143                [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector( _systemDidWake: ) name:NSWorkspaceDidWakeNotification object:[NSWorkspace sharedWorkspace]]; 
    143144                [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector( _systemWillSleep: ) name:NSWorkspaceWillSleepNotification object:[NSWorkspace sharedWorkspace]]; 
    144145                [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector( _applicationWillTerminate: ) name:NSWorkspaceWillPowerOffNotification object:[NSWorkspace sharedWorkspace]]; 
    145146                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector( _applicationWillTerminate: ) name:NSApplicationWillTerminateNotification object:[NSApplication sharedApplication]]; 
     147#endif 
    146148        } 
    147149 
    …… 
    232234- (void) dealloc { 
    233235        [[NSNotificationCenter defaultCenter] removeObserver:self]; 
     236 
     237#if !defined(TARGET_OS_ASPEN) || !TARGET_OS_ASPEN 
    234238        [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self]; 
     239#endif 
    235240 
    236241        [_npassword release]; 
    …… 
    502507} 
    503508 
    504 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    505 @property(getter=isSecure, setter=setSecure:) BOOL secure; 
    506 #endif 
    507  
    508509- (BOOL) isSecure { 
    509510        return _secure; 
    …… 
    826827#pragma mark - 
    827828 
    828 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    829 @property(readonly, getter=isConnected) BOOL connected; 
    830 #endif 
    831  
    832829- (BOOL) isConnected { 
    833830        return ( _status == MVChatConnectionConnectedStatus ); 
    …… 
    858855        _reconnectTimer = nil; 
    859856} 
    860  
    861 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    862 @property(readonly, getter=isWaitingToReconnect) BOOL waitingToReconnect; 
    863 #endif 
    864857 
    865858- (BOOL) isWaitingToReconnect { 

  • trunk/Chat Core/MVChatRoom.h

    r3722 r3778  
    7777 
    7878#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    79 @property(readonly, ivar) MVChatConnection *connection; 
     79@property(readonly) MVChatConnection *connection; 
    8080 
    8181@property(readonly) NSURL *url; 
    82 @property(readonly, ivar) NSString *name; 
     82@property(readonly) NSString *name; 
    8383@property(readonly) NSString *displayName; 
    84 @property(readonly, ivar) id uniqueIdentifier; 
    85  
    86 @property(readonly) BOOL joined; 
    87 @property(readonly, ivar) NSDate *dateJoined; 
    88 @property(readonly, ivar) NSDate *dateParted; 
    89  
    90 @property(ivar) NSStringEncoding encoding; 
    91  
    92 @property(readonly, ivar) NSData *topic; 
    93 @property(readonly, ivar) MVChatUser *topicAuthor; 
    94 @property(readonly, ivar) NSDate *dateTopicChanged; 
     84@property(readonly) id uniqueIdentifier; 
     85 
     86@property(readonly, getter=isJoined) BOOL joined; 
     87@property(readonly) NSDate *dateJoined; 
     88@property(readonly) NSDate *dateParted; 
     89 
     90@property NSStringEncoding encoding; 
     91 
     92@property(readonly) NSData *topic; 
     93@property(readonly) MVChatUser *topicAuthor; 
     94@property(readonly) NSDate *dateTopicChanged; 
    9595 
    9696@property(readonly) NSSet *supportedAttributes; 
    …… 
    9999@property(readonly) unsigned long supportedModes; 
    100100@property(readonly) unsigned long supportedMemberUserModes; 
    101 @property(readonly, ivar) unsigned long modes; 
     101@property(readonly) unsigned long modes; 
    102102 
    103103@property(readonly) MVChatUser *localMemberUser; 

  • trunk/Chat Core/MVChatRoom.m

    r3725 r3778  
    110110#pragma mark - 
    111111 
    112 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    113112- (MVChatConnection *) connection { 
    114113        return _connection; 
    115114} 
    116 #endif 
    117115 
    118116#pragma mark - 
    …… 
    159157} 
    160158 
    161 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    162159- (NSString *) name { 
    163160        return _name; 
    164161} 
    165 #endif 
    166162 
    167163- (NSString *) displayName { 
    …… 
    169165} 
    170166 
    171 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    172167- (id) uniqueIdentifier { 
    173168        return _uniqueIdentifier; 
    174169} 
    175 #endif 
    176170 
    177171#pragma mark - 
    …… 
    195189#pragma mark - 
    196190 
    197 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    198 @property(readonly, getter=isJoined) BOOL joined; 
    199 #endif 
    200  
    201191- (BOOL) isJoined { 
    202192        return ( [self dateJoined] && ! [self dateParted] ); 
    203193} 
    204194 
    205 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    206195- (NSDate *) dateJoined { 
    207196        return _dateJoined; 
    …… 
    211200        return _dateParted; 
    212201} 
    213 #endif 
    214  
    215 #pragma mark - 
    216  
    217 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
     202 
     203#pragma mark - 
     204 
    218205- (NSStringEncoding) encoding { 
    219206        return _encoding; 
    …… 
    223210        _encoding = encoding; 
    224211} 
    225 #endif 
    226212 
    227213#pragma mark - 
    …… 
    252238#pragma mark - 
    253239 
    254 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    255240- (NSData *) topic { 
    256241        return _topic; 
    257242} 
    258 #endif 
    259243 
    260244- (void) setTopic:(MVChatString *) topic { 
    …… 
    262246} 
    263247 
    264 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    265248- (MVChatUser *) topicAuthor { 
    266249        return _topicAuthor; 
    …… 
    270253        return _dateTopicChanged; 
    271254} 
    272 #endif 
    273255 
    274256#pragma mark - 
    …… 
    331313#pragma mark - 
    332314 
    333 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    334315- (unsigned long) modes { 
    335316        return _modes; 
    336317} 
    337 #endif 
    338318 
    339319- (id) attributeForMode:(MVChatRoomMode) mode { 

  • trunk/Chat Core/MVChatUser.h

    r3722 r3778  
    8585 
    8686#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    87 @property(readonly, ivar) MVChatConnection *connection; 
    88 @property(readonly, ivar) MVChatUserType type; 
    89  
    90 @property(readonly) BOOL remoteUser; 
    91 @property(readonly) BOOL localUser; 
    92 @property(readonly) BOOL wildcardUser; 
    93  
    94 @property(readonly) BOOL identified; 
    95 @property(readonly) BOOL serverOperator; 
    96 @property(readonly) BOOL watched; 
    97  
    98 @property(readonly, ivar) MVChatUserStatus status; 
    99 @property(readonly, ivar) NSData *awayStatusMessage; 
    100  
    101 @property(readonly, ivar) NSDate *dateConnected; 
    102 @property(readonly, ivar) NSDate *dateDisconnected; 
    103 @property(readonly, ivar) NSDate *dateUpdated; 
    104  
    105 @property(readonly, ivar) NSTimeInterval idleTime; 
    106 @property(readonly, ivar) NSTimeInterval lag; 
     87@property(readonly) MVChatConnection *connection; 
     88@property(readonly) MVChatUserType type; 
     89 
     90@property(readonly, getter=isRemoteUser) BOOL remoteUser; 
     91@property(readonly, getter=isLocalUser) BOOL localUser; 
     92@property(readonly, getter=isWildcardUser) BOOL wildcardUser; 
     93 
     94@property(readonly, getter=isIdentified) BOOL identified; 
     95@property(readonly, getter=isServerOperator) BOOL serverOperator; 
     96 
     97@property(readonly) MVChatUserStatus status; 
     98@property(readonly) NSData *awayStatusMessage; 
     99 
     100@property(readonly) NSDate *dateConnected; 
     101@property(readonly) NSDate *dateDisconnected; 
     102@property(readonly) NSDate *dateUpdated; 
     103 
     104@property(readonly) NSTimeInterval idleTime; 
     105@property(readonly) NSTimeInterval lag; 
    107106 
    108107@property(readonly) NSString *displayName; 
    …… 
    113112@property(readonly) NSString *serverAddress; 
    114113 
    115 @property(readonly, ivar) id uniqueIdentifier; 
    116 @property(readonly, ivar) NSData *publicKey; 
    117 @property(readonly, ivar) NSString *fingerprint; 
     114@property(readonly) id uniqueIdentifier; 
     115@property(readonly) NSData *publicKey; 
     116@property(readonly) NSString *fingerprint; 
    118117 
    119118@property(readonly) unsigned long supportedModes; 
    120 @property(readonly, ivar) unsigned long modes; 
     119@property(readonly) unsigned long modes; 
    121120 
    122121@property(readonly) NSSet *supportedAttributes; 

  • trunk/Chat Core/MVChatUser.m

    r3725 r3778  
    134134#pragma mark - 
    135135 
    136 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    137136- (MVChatConnection *) connection { 
    138137        return _connection; 
    …… 
    142141        return _type; 
    143142} 
    144 #endif 
    145  
    146 #pragma mark - 
    147  
    148 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    149 @property(readonly, getter=isRemoteUser) BOOL remoteUser; 
    150 @property(readonly, getter=isLocalUser) BOOL localUser; 
    151 @property(readonly, getter=isWildcardUser) BOOL wildcardUser; 
    152 #endif 
     143 
     144#pragma mark - 
    153145 
    154146- (BOOL) isRemoteUser { 
    …… 
    165157 
    166158#pragma mark - 
    167  
    168 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    169 @property(readonly, getter=isIdentified) BOOL identified; 
    170 @property(readonly, getter=isServerOperator) BOOL serverOperator; 
    171 #endif 
    172159 
    173160- (BOOL) isIdentified { 
    …… 
    266253#pragma mark - 
    267254 
    268 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    269255- (MVChatUserStatus) status { 
    270256        return _status; 
    …… 
    298284        return _lag; 
    299285} 
    300 #endif 
    301286 
    302287#pragma mark - 
    …… 
    337322#pragma mark - 
    338323 
    339 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    340324- (id) uniqueIdentifier { 
    341325        return _uniqueIdentifier; 
    …… 
    349333        return _fingerprint; 
    350334} 
    351 #endif 
    352335 
    353336#pragma mark - 
    …… 
    358341} 
    359342 
    360 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    361343- (unsigned long) modes { 
    362344        return _modes; 
    363345} 
    364 #endif 
    365346 
    366347#pragma mark - 

  • trunk/Chat Core/MVChatUserWatchRule.h

    r3526 r3778  
    3232@property(readonly) NSSet *matchedChatUsers; 
    3333 
    34 @property(bycopy) NSString *nickname; 
     34@property(copy) NSString *nickname; 
    3535@property(readonly) BOOL nicknameIsRegularExpression; 
    3636 
    37 @property(bycopy) NSString *realName; 
     37@property(copy) NSString *realName; 
    3838@property(readonly) BOOL realNameIsRegularExpression; 
    3939 
    40 @property(bycopy) NSString *username; 
     40@property(copy) NSString *username; 
    4141@property(readonly) BOOL usernameIsRegularExpression; 
    4242 
    43 @property(bycopy) NSString *address; 
     43@property(copy) NSString *address; 
    4444@property(readonly) BOOL addressIsRegularExpression; 
    4545 
    46 @property(ivar, bycopy) NSData *publicKey; 
     46@property(copy) NSData *publicKey; 
    4747 
    48 @property(ivar) BOOL interim; 
     48@property(getter=isInterim) BOOL interim; 
    4949 
    50 @property(ivar, bycopy) NSArray *applicableServerDomains; 
     50@property(copy) NSArray *applicableServerDomains; 
    5151 
    5252#else 

  • trunk/Chat Core/MVChatUserWatchRule.m

    r3530 r3778  
    254254} 
    255255 
    256 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    257256- (NSData *) publicKey { 
    258257        return _publicKey; 
    …… 
    262261        MVSafeCopyAssign( &_publicKey, publicKey ); 
    263262} 
    264 #endif 
    265  
    266 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    267 @property(ivar, getter=isInterim) BOOL interim; 
    268 #endif 
    269263 
    270264- (BOOL) isInterim { 
    …… 
    272266} 
    273267 
    274 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    275268- (void) setInterim:(BOOL) interim { 
    276269        _interim = interim; 
    …… 
    284277        MVSafeCopyAssign( &_applicableServerDomains, serverDomains ); 
    285278} 
    286 #endif 
    287279@end 

  • trunk/Chat Core/MVFileTransfer.h

    r3526 r3778  
    4747 
    4848#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    49 @property(readonly) BOOL upload; 
    50 @property(readonly) BOOL download; 
    51 @property(readonly) BOOL passive; 
    52 @property(readonly, ivar) MVFileTransferStatus status; 
    53 @property(readonly, ivar) NSError *lastError; 
     49@property(readonly, getter=isUpload) BOOL upload; 
     50@property(readonly, getter=isDownload) BOOL download; 
     51@property(readonly, getter=isPassive) BOOL passive; 
     52@property(readonly) MVFileTransferStatus status; 
     53@property(readonly) NSError *lastError; 
    5454 
    55 @property(readonly, ivar) unsigned long long finalSize; 
    56 @property(readonly, ivar) unsigned long long transfered; 
     55@property(readonly) unsigned long long finalSize; 
     56@property(readonly) unsigned long long transfered; 
    5757 
    58 @property(readonly, ivar) NSDate *startDate; 
    59 @property(readonly, ivar) unsigned long long startOffset; 
     58@property(readonly) NSDate *startDate; 
     59@property(readonly) unsigned long long startOffset; 
    6060 
    61 @property(readonly, ivar) NSHost *host; 
    62 @property(readonly, ivar) unsigned short port; 
     61@property(readonly) NSHost *host; 
     62@property(readonly) unsigned short port; 
    6363 
    64 @property(readonly, ivar) MVChatUser *user; 
     64@property(readonly) MVChatUser *user; 
    6565 
    6666#else 
    …… 
    9999 
    100100#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    101 @property(readonly, ivar) NSString *source; 
     101@property(readonly) NSString *source; 
    102102#else 
    103103- (NSString *) source; 
    …… 
    114114} 
    115115#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    116 @property(ivar, bycopy) NSString *destination; 
    117 @property(readonly, ivar) NSString *originalFileName; 
     116@property(copy) NSString *destination; 
     117@property(readonly) NSString *originalFileName; 
    118118#else 
    119119- (NSString *) destination; 

  • trunk/Chat Core/MVFileTransfer.m

    r3722 r3778  
    8080#pragma mark - 
    8181 
    82 #if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 
    83 @property(readonly, getter=isUpload) BOOL upload; 
    84 @property(readonly, getter=isDownload) BOOL download; 
    85 @property(readonly, getter=isPassive) BOOL passive; 
    86 #endif 
    87  
    8882- (BOOL) isUpload { 
    8983        return NO; 
    …… 
    9892} 
    9993 
    100 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    10194- (MVFileTransferStatus) status { 
    10295        return _status; 
    …… 
    142135        return _user; 
    143136} 
    144 #endif 
    145137 
    146138#pragma mark - 
    …… 
    226218#pragma mark - 
    227219 
    228 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    229220- (NSString *) source { 
    230221        return _source; 
    231222} 
    232 #endif 
    233223 
    234224#pragma mark - 
    …… 
    273263} 
    274264 
    275 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4 
    276265- (NSString *) destination { 
    277266        return _destination; 
    …… 
    283272        return _originalFileName; 
    284273} 
    285 #endif 
    286274 
    287275#pragma mark - 

  • trunk/Chat Core/MVICBChatRoom.m

    r3722 r3778  
    3535#import "MVICBChatConnection.h" 
    3636#import "MVICBChatRoom.h" 
     37#import "MVChatConnectionPrivate.h" 
    3738#import "MVChatString.h" 
    3839 
    …… 
    5859- (void) setTopic:(MVChatString *) newTopic { 
    5960        NSParameterAssert( newTopic ); 
    60         [(MVICBChatConnection *)_connection ctsCommandTopicSet:[newTopic string]]; 
     61#if USE(ATTRIBUTED_CHAT_STRING) 
     62        NSString *newTopicString = [newTopic string]; 
     63#elif USE(PLAIN_CHAT_STRING) 
     64        NSString *newTopicString = newTopic; 
     65#endif 
     66        [(MVICBChatConnection *)_connection ctsCommandTopicSet:newTopicString]; 
    6167} 
    6268 
    63 - (void) sendMessage:(MVChatString *) message 
    64          withEncoding:(NSStringEncoding) encoding withAttributes:(NSDictionary *) attributes { 
     69- (void) sendMessage:(MVChatString *) message withEncoding:(NSStringEncoding) encoding withAttributes:(NSDictionary *) attributes { 
     70#if USE(ATTRIBUTED_CHAT_STRING) 
     71        NSString *messageString = [message string]; 
     72#elif USE(PLAIN_CHAT_STRING) 
     73        NSString *messageString = message; 
     74#endif 
    6575        if( [_memberUsers count] > 1 ) 
    66                 [(MVICBChatConnection *)_connection ctsOpenPacket:[message string]]; 
     76                [(MVICBChatConnection *)_connection ctsOpenPacket:messageString]; 
    6777} 
    6878 

  • trunk/Chat Core/MVICBChatUser.m

    r3722 r3778  
    3535#import "MVICBChatConnection.h" 
    3636#import "MVICBChatUser.h" 
     37#import "MVChatConnectionPrivate.h" 
    3738#import "MVChatString.h" 
    3839 
    …… 
    6970#pragma mark Message handling 
    7071 
    71 - (void) sendMessage:(MVChatString *) message 
    72          withEncoding:(NSStringEncoding) encoding 
    73                  withAttributes:(NSDictionary *) attributes { 
    74         [(MVICBChatConnection *)_connection ctsCommandPersonal:_nickname withMessage:[message string]]; 
     72- (void) sendMessage:(MVChatString *) message withEncoding:(NSStringEncoding) encoding withAttributes:(NSDictionary *) attributes { 
     73#if USE(ATTRIBUTED_CHAT_STRING) 
     74        NSString *messageString = [message string]; 
     75#elif USE(PLAIN_CHAT_STRING) 
     76        NSString *messageString = message; 
     77#endif 
     78        [(MVICBChatConnection *)_connection ctsCommandPersonal:_nickname withMessage:messageString]; 
    7579} 
    7680 

  • trunk/Frameworks/AGRegex/AGRegex.m

    r3642 r3778  
    143143        // check for valid ASCII string 
    144144        if (![str canBeConvertedToEncoding:NSASCIIStringEncoding]) 
    145                 [NSException raise:@"%@ is not a valid ASCII string, build with UTF-8 support", str]; 
     145                [NSException raise:NSInvalidArgumentException format:@"%@ is not a valid ASCII string, build with UTF-8 support", str]; 
    146146#endif 
    147147        // sanity check range