Changeset 3722

Timestamp:

09/13/07 01:39:44 (1 year ago)

Author:

timothy

Message:

Adding some defines to allow disabling of features and/or chat protocols at compile time. Also allos Chat Core to work without NSAttributedString.

Files:

• trunk/Chat Core/ChatCore.h (modified) (1 diff)
• trunk/Chat Core/MVChatConnection.h (modified) (5 diffs)
• trunk/Chat Core/MVChatConnection.m (modified) (14 diffs)
• trunk/Chat Core/MVChatConnectionPrivate.h (modified) (1 diff)
• trunk/Chat Core/MVChatRoom.h (modified) (3 diffs)
• trunk/Chat Core/MVChatRoom.m (modified) (4 diffs)
• trunk/Chat Core/MVChatUser.h (modified) (2 diffs)
• trunk/Chat Core/MVChatUser.m (modified) (1 diff)
• trunk/Chat Core/MVDirectChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVDirectChatConnection.m (modified) (4 diffs)
• trunk/Chat Core/MVDirectClientConnection.m (modified) (11 diffs)
• trunk/Chat Core/MVFileTransfer.m (modified) (3 diffs)
• trunk/Chat Core/MVICBChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVICBChatConnection.m (modified) (2 diffs)
• trunk/Chat Core/MVICBChatRoom.h (modified) (1 diff)
• trunk/Chat Core/MVICBChatRoom.m (modified) (2 diffs)
• trunk/Chat Core/MVICBChatUser.m (modified) (2 diffs)
• trunk/Chat Core/MVIRCChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVIRCChatConnection.m (modified) (18 diffs)
• trunk/Chat Core/MVIRCChatRoom.m (modified) (4 diffs)
• trunk/Chat Core/MVIRCChatUser.m (modified) (2 diffs)
• trunk/Chat Core/MVSILCChatConnection.h (modified) (1 diff)
• trunk/Chat Core/MVSILCChatConnection.m (modified) (7 diffs)
• trunk/Chat Core/MVSILCChatRoom.m (modified) (5 diffs)
• trunk/Chat Core/MVSILCChatUser.m (modified) (2 diffs)
• trunk/Chat Core/MVXMPPChatConnection.m (modified) (2 diffs)
• trunk/Chat Core/MVXMPPChatRoom.m (modified) (5 diffs)
• trunk/Chat Core/MVXMPPChatUser.m (modified) (2 diffs)

trunk/Chat Core/ChatCore.h

@@ -1 +1 @@
-#import <ChatCore/MVUtilities.h>
+#import <ChatCore/MVChatString.h>
-
-#import <ChatCore/MVChatConnection.h>

trunk/Chat Core/MVChatConnection.h

@@ +1 @@
+#import <ChatCore/MVChatString.h>
+
-typedef enum {
-        MVChatConnectionUnsupportedType = 0,
@@ -102 +104 @@
-        NSDate *_lastConnectAttempt;
-        NSTimer *_reconnectTimer;
-
+
+
-        NSMutableDictionary *_persistentInformation;
-        NSError *_lastError;
@@ -188 +191 @@
-@property(readonly) NSSet *chatUserWatchRules;
-
-NSAttributed
+MVChat
-
-@property(readonly) BOOL connected;
@@ -320 +323 @@
-#pragma mark -
-
-NSAttributed
-NSAttributed
+MVChat
+MVChat
-
-#pragma mark -
@@ -345 +348 @@
-- (void) connectToServer:(NSString *) server onPort:(unsigned short) port asUser:(NSString *) nickname;
-- (void) disconnect;
-NSAttributed
+MVChat
-
-#pragma mark -

trunk/Chat Core/MVChatConnection.m

@@ -1 +1 @@
-#import "MVChatConnection.h"
+#import "MVChatConnectionPrivate.h"
-#import "MVChatRoom.h"
-#import "MVChatRoomPrivate.h"
-#import "MVChatUser.h"
-#import "MVChatUserPrivate.h"
-#import "MVICBChatConnection.h"
-#import "MVIRCChatConnection.h"
-#import "MVSILCChatConnection.h"
-#import "MVXMPPChatConnection.h"
-#import "MVFileTransfer.h"
-#import "MVChatPluginManager.h"
-#import "MVChatUserWatchRule.h"
-#import "NSStringAdditions.h"
-#import "NSAttributedStringAdditions.h"
-#import "NSMethodSignatureAdditions.h"
-#import "NSScriptCommandAdditions.h"
-#import "NSNotificationAdditions.h"
-#import "MVUtilities.h"
+#import "MVChatString.h"
+
+#if USE(ATTRIBUTED_CHAT_STRING)
+#import "NSAttributedStringAdditions.h"
+#endif
+
+#if ENABLE(SCRIPTING)
+#import "NSScriptCommandAdditions.h"
+#endif
+
+#if ENABLE(PLUGINS)
+#import "NSMethodSignatureAdditions.h"
+#import "MVChatPluginManager.h"
+#endif
+
+#if ENABLE(ICB)
+#import "MVICBChatConnection.h"
+#endif
+
+#if ENABLE(IRC)
+#import "MVIRCChatConnection.h"
+#endif
+
+#if ENABLE(SILC)
+#import "MVSILCChatConnection.h"
+#endif
+
+#if ENABLE(XMPP)
+#import "MVXMPPChatConnection.h"
+#endif
-
-NSString *MVChatConnectionWillConnectNotification = @"MVChatConnectionWillConnectNotification";
@@ -58 +81 @@
-+ (BOOL) supportsURLScheme:(NSString *) scheme {
-        if( ! scheme ) return NO;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-+ (NSArray *) defaultServerPortsForType:(MVChatConnectionType) type {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        return nil;
-}
@@ -103 +152 @@
-        [self release];
-
-
+
+
+
-                self = [[MVICBChatConnection allocWithZone:nil] init];
-
+
+
+
+
-                self = [[MVIRCChatConnection allocWithZone:nil] init];
-
+
+
+
+
-                self = [[MVSILCChatConnection allocWithZone:nil] init];
-
+
+
+
+
-                self = [[MVXMPPChatConnection allocWithZone:nil] init];
-
+
+
+
+
+
-
-        return self;
@@ -120 +184 @@
-
-        int connectionType = 0;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        if( ( self = [self initWithServer:[serverURL host] type:connectionType port:( [[serverURL port] unsignedIntValue] % 65536 ) user:[serverURL user]] ) ) {
@@ -251 +328 @@
-}
-
-NSAttributed
+MVChat
-// subclass this method
-        [self doesNotRecognizeSelector:_cmd];
@@ -738 +815 @@
-#pragma mark -
-
-NSAttributed
+MVChat
-        return _awayMessage;
-}
-
-NSAttributed
+MVChat
-// subclass this method
-        [self doesNotRecognizeSelector:_cmd];
@@ -830 +907 @@
-        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionDidConnectNotification object:self];
-
+#if ENABLE(PLUGINS)
-        NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( MVChatConnection * ), nil];
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
@@ -837 +915 @@
-
-        [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+#endif
-}
-
@@ -848 +927 @@
-        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionWillDisconnectNotification object:self];
-
+#if ENABLE(PLUGINS)
-        NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( MVChatConnection * ), nil];
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
@@ -855 +935 @@
-
-        [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+#endif
-}
-
@@ -973 +1054 @@
-#pragma mark -
-
+#if ENABLE(SCRIPTING)
-@implementation MVChatConnection (MVChatConnectionScripting)
-- (NSNumber *) uniqueIdentifier {
@@ -1019 +1101 @@
-
-- (NSTextStorage *) scriptTypedAwayMessage {
-
+
+
+
+
+
-}
-
-- (void) setScriptTypedAwayMessage:(id) message {
+#if USE(ATTRIBUTED_CHAT_STRING)
-        NSString *msg = message;
-        if( [message isKindOfClass:[NSTextStorage class]] ) msg = [message string];
-        NSAttributedString *attributeMsg = [NSAttributedString attributedStringWithHTMLFragment:msg baseURL:nil];
-        [self setAwayStatusMessage:attributeMsg];
+#elif USE(PLAIN_CHAT_STRING)
+        if( [message isKindOfClass:[NSString class]] );
+                [self setAwayStatusMessage:message];
+#endif
-}
-
@@ -1190 +1281 @@
-        }
-
+#if USE(ATTRIBUTED_CHAT_STRING)
-        NSAttributedString *realMessage = [NSAttributedString attributedStringWithHTMLFragment:message baseURL:nil];
+#elif USE(PLAIN_CHAT_STRING)
+        NSString *realMessage = message;
+#endif
+
-        NSStringEncoding realEncoding = NSUTF8StringEncoding;
-        BOOL realAction = ( action ? [action boolValue] : NO );
@@ -1379 +1475 @@
-}
-@end
+#endif

trunk/Chat Core/MVChatConnectionPrivate.h

@@ +1 @@
+#define ENABLE(CHAT_FEATURE) (defined(ENABLE_##CHAT_FEATURE) && ENABLE_##CHAT_FEATURE)
+#define USE(CHAT_FEATURE) (defined(USE_##CHAT_FEATURE) && USE_##CHAT_FEATURE)
+
+#ifndef ENABLE_AUTO_PORT_MAPPING
+#define ENABLE_AUTO_PORT_MAPPING 1
+#endif
+
+#ifndef ENABLE_SCRIPTING
+#define ENABLE_SCRIPTING 1
+#endif
+
+#ifndef ENABLE_PLUGINS
+#define ENABLE_PLUGINS 1
+#endif
+
+#ifndef ENABLE_IRC
+#define ENABLE_IRC 1
+#endif
+
+#ifndef ENABLE_SILC
+#define ENABLE_SILC 1
+#endif
+
+#ifndef ENABLE_ICB
+#define ENABLE_ICB 1
+#endif
+
+#ifndef ENABLE_XMPP
+#define ENABLE_XMPP 1
+#endif
+
-#import "MVChatConnection.h"
-

trunk/Chat Core/MVChatRoom.h

@@ +1 @@
+#import <ChatCore/MVChatString.h>
+
-typedef enum {
-        MVChatRoomNoModes = 0,
@@ -144 +146 @@
-- (void) join;
-- (void) part;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-- (void) sendSubcodeRequest:(NSString *) command withArguments:(id) arguments;
@@ -175 +178 @@
-- (BOOL) hasUser:(MVChatUser *) user;
-
-NSAttributed
+MVChat
-
-- (void) addBanForUser:(MVChatUser *) user;

trunk/Chat Core/MVChatRoom.m

@@ -186 +186 @@
-}
-
-NSAttributed
+MVChat
-// subclass this method, don't call super
-        [self doesNotRecognizeSelector:_cmd];
@@ -225 +225 @@
-#pragma mark -
-
-NSAttributed
+MVChat
-        [self sendMessage:message withEncoding:[self encoding] asAction:action];
-}
-
-NSAttributed
+MVChat
-        [self sendMessage:message withEncoding:encoding withAttributes:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:action] forKey:@"action"]];
-}
-
-NSAttributed
+MVChat
-        // subclass this method, don't call super
-        [self doesNotRecognizeSelector:_cmd];
@@ -256 +256 @@
-#endif
-
-NSAttributed
+MVChat
-// subclass this method, if needed
-}
@@ -448 +448 @@
-#pragma mark -
-
-NSAttributed
+MVChat
-        NSParameterAssert( user != nil );
-// subclass this method, call super first

trunk/Chat Core/MVChatUser.h

@@ +1 @@
+#import <ChatCore/MVChatString.h>
+
-typedef enum {
-        MVChatRemoteUserType = 'remT',
@@ -180 +182 @@
-- (void) setAttribute:(id) attribute forKey:(id) key;
-
-
-
+
+
+
-- (MVUploadFileTransfer *) sendFile:(NSString *) path passively:(BOOL) passive;
-

trunk/Chat Core/MVChatUser.m

@@ -421 +421 @@
-#pragma mark -
-
-NSAttributed
+MVChat
-        [self sendMessage:message withEncoding:encoding withAttributes:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:action] forKey:@"action"]];
-}
-
-NSAttributed
+MVChat
-        // subclass this method, don't call super
-        [self doesNotRecognizeSelector:_cmd];

trunk/Chat Core/MVDirectChatConnection.h

@@ -57 +57 @@
-- (MVChatMessageFormat) outgoingChatFormat;
-
-NSAttributed
-NSAttributed
+MVChat
+MVChat
-@end

trunk/Chat Core/MVDirectChatConnection.m

@@ -7 +7 @@
-#import "MVFileTransfer.h"
-#import "MVChatUser.h"
+#import "MVChatString.h"
-#import "MVUtilities.h"
-#import "NSNotificationAdditions.h"
-#import "NSStringAdditions.h"
+
+#if USE(ATTRIBUTED_CHAT_STRING)
-#import "NSAttributedStringAdditions.h"
+#endif
-
-NSString *MVDirectChatConnectionOfferNotification = @"MVDirectChatConnectionOfferNotification";
@@ -155 +159 @@
-#pragma mark -
-
-NSAttributed
+MVChat
-        [self sendMessage:message withEncoding:[self encoding] asAction:action];
-}
-
-NSAttributed
+MVChat
-        [self sendMessage:message withEncoding:encoding withAttributes:[NSDictionary dictionaryWithObject:[NSNumber numberWithBool:action] forKey:@"action"]];
-}
-
-NSAttributed
+MVChat
-        NSParameterAssert( message != nil );
-
@@ -169 +173 @@
-                return;
-
+#if USE(ATTRIBUTED_CHAT_STRING)
-        NSString *cformat = nil;
-
@@ -186 +191 @@
-        NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithUnsignedInt:encoding], @"StringEncoding", cformat, @"FormatType", nil];
-        NSData *msg = [message chatFormatWithOptions:options];
+#elif USE(PLAIN_CHAT_STRING)
+        NSData *msg = [message dataUsingEncoding:encoding allowLossyConversion:YES];
+#endif
-
-        if( [[attributes objectForKey:@"action"] boolValue] ) {

trunk/Chat Core/MVDirectClientConnection.m

@@ -21 +21 @@
-}
-
+#if ENABLE(AUTO_PORT_MAPPING)
-static int natTraversalStatus( tr_upnp_t *upnp, tr_natpmp_t *natpmp ) {
-        int statuses[] = {
@@ -44 +45 @@
-        return TR_NAT_TRAVERSAL_ERROR;
-}
+#endif
-
-#pragma mark -
@@ -60 +62 @@
-        [_connection disconnect];
-
+#if ENABLE(AUTO_PORT_MAPPING)
-        if( _upnp ) tr_upnpClose( _upnp );
-        _upnp = NULL;
@@ -65 +68 @@
-        if( _natpmp ) tr_natpmpClose( _natpmp );
-        _natpmp = NULL;
+#endif
-
-        [super finalize];
@@ -85 +89 @@
-        _threadWaitLock = nil;
-
+#if ENABLE(AUTO_PORT_MAPPING)
-        if( _upnp ) tr_upnpClose( _upnp );
-        _upnp = NULL;
@@ -90 +95 @@
-        if( _natpmp ) tr_natpmpClose( _natpmp );
-        _natpmp = NULL;
+#endif
-
-        _connectionThread = nil;
@@ -275 +281 @@
-        }
-
+#if ENABLE(AUTO_PORT_MAPPING)
-        if( success && [MVFileTransfer isAutoPortMappingEnabled] ) {
-                tr_msgInit();
@@ -296 +303 @@
-                } while( ( status == 1 || status == 3 ) && ABS( [mappingStart timeIntervalSinceNow] ) < 5. ); 
-        }
+#endif
-
-        if( success && [_delegate respondsToSelector:@selector( directClientConnection:acceptingConnectionsToHost:port: )] )
@@ -304 +312 @@
-        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector( _finish ) object:nil];       
-
+#if ENABLE(AUTO_PORT_MAPPING)
-        if( _upnp ) tr_upnpClose( _upnp );
-        _upnp = NULL;
@@ -309 +318 @@
-        if( _natpmp ) tr_natpmpClose( _natpmp );
-        _natpmp = NULL;
+#endif
-
-        id old = _acceptConnection;
@@ -345 +355 @@
-
-        while( ! _done ) {
+#if ENABLE(AUTO_PORT_MAPPING)
-                if( _upnp ) tr_upnpPulse( _upnp );
-                if( _natpmp ) tr_natpmpPulse( _natpmp );
+#endif
-
-                pool = [[NSAutoreleasePool allocWithZone:nil] init];

trunk/Chat Core/MVFileTransfer.m

@@ -1 +1 @@
-#import "MVFileTransfer.h"
-
-
+
-#import "MVChatConnection.h"
-#import "MVIRCChatConnection.h"
-#import "MVChatUser.h"
-#import "MVUtilities.h"
-#import "NSNotificationAdditions.h"
+
+#if ENABLE(IRC)
+#import "MVIRCFileTransfer.h"
+#import "MVIRCChatConnection.h"
+#endif
+
+#if ENABLE(SILC)
+#import "MVSILCFileTransfer.h"
+#endif
-
-NSString *MVDownloadFileTransferOfferNotification = @"MVDownloadFileTransferOfferNotification";
@@ -32 +39 @@
-
-+ (BOOL) isAutoPortMappingEnabled {
+#if ENABLE(AUTO_PORT_MAPPING)
-        return autoPortMapping;
+#else
+        return NO;
+#endif
-}
-
@@ -191 +202 @@
-@implementation MVUploadFileTransfer
-+ (id) transferWithSourceFile:(NSString *) path toUser:(MVChatUser *) user passively:(BOOL) passive {
-
+
+
+
-                return [MVIRCUploadFileTransfer transferWithSourceFile:path toUser:user passively:passive];
-
+
+
+
-                return [MVSILCUploadFileTransfer transferWithSourceFile:path toUser:user passively:passive];
+#endif
+        default:
+                return nil;
-        }
-
-        return nil;
-}
-

trunk/Chat Core/MVICBChatConnection.h

@@ -61 +61 @@
-+ (NSArray *) defaultServerPorts;
-
-- (id) init;
-- (void) finalize;
-- (MVChatConnectionType) type;
-- (void) connect;
-- (void) disconnectWithReason:(NSAttributedString *) reason;
-- (NSString *) urlScheme;
-- (void) setUsername:(NSString *) newUsername;
-- (NSString *) username;
-- (void) setNickname:(NSString *) newNickname;
-- (NSString *) nickname;
-- (void) setPassword:(NSString *) newPassword;
-- (NSString *) password;
-- (void) setServer:(NSString *) newServer;
-- (NSString *) server;
-- (void) setServerPort:(unsigned short) port;
-- (unsigned short) serverPort;
-- (void) sendRawMessage:(id) raw immediately:(BOOL) now;
-- (void) joinChatRoomsNamed:(NSArray *) rooms;
-- (void) joinChatRoomNamed:(NSString *) room withPassphrase:
-                           (NSString *) passphrase;
-- (NSSet *) knownChatUsers;
-- (NSSet *) chatUsersWithNickname:(NSString *) nickname;
-- (MVChatUser *) chatUserWithUniqueIdentifier:(id) identifier;
-- (MVChatRoom *) chatRoomWithUniqueIdentifier:(id) identifier;
-- (void) fetchChatRoomList;
-- (void) setAwayStatusMessage:(NSAttributedString *) message;
-
-@end
-

trunk/Chat Core/MVICBChatConnection.m

@@ -161 +161 @@
-#pragma mark Modifiers
-
-NSAttributed
+MVChat
-}
-
@@ -242 +242 @@
-}
-
-NSAttributed
+MVChat
-        [self cancelPendingReconnectAttempts];
-        if( _sendQueueProcessing && _connectionThread )

trunk/Chat Core/MVICBChatRoom.h

@@ -42 +42 @@
-- (id) initWithName:(NSString *) name
-       andConnection:(MVICBChatConnection *) connection;
-
-- (void) partWithReason:(NSAttributedString *) reason;
-- (void) setTopic:(NSAttributedString *) newTopic;
-- (void) sendMessage:(NSAttributedString *) message
-         withEncoding:(NSStringEncoding) encoding withAttributes:(NSDictionary *) attributes;
-@end

trunk/Chat Core/MVICBChatRoom.m

@@ -35 +35 @@
-#import "MVICBChatConnection.h"
-#import "MVICBChatRoom.h"
+#import "MVChatString.h"
-
-@implementation MVICBChatRoom
@@ -52 +53 @@
-#pragma mark Generic room handling
-
-NSAttributed
+MVChat
-}
-
-NSAttributed
+MVChat
-        NSParameterAssert( newTopic );
-        [(MVICBChatConnection *)_connection ctsCommandTopicSet:[newTopic string]];
-}
-
-NSAttributed
+MVChat
-         withEncoding:(NSStringEncoding) encoding withAttributes:(NSDictionary *) attributes {
-        if( [_memberUsers count] > 1 )

trunk/Chat Core/MVICBChatUser.m

@@ -35 +35 @@
-#import "MVICBChatConnection.h"
-#import "MVICBChatUser.h"
+#import "MVChatString.h"
-
-@implementation MVICBChatUser
@@ -68 +69 @@
-#pragma mark Message handling
-
-NSAttributed
+MVChat
-         withEncoding:(NSStringEncoding) encoding
-                 withAttributes:(NSDictionary *) attributes {

trunk/Chat Core/MVIRCChatConnection.h

@@ -43 +43 @@
-
-- (void) _handleCTCP:(NSMutableData *) data asRequest:(BOOL) request fromSender:(MVChatUser *) sender forRoom:(MVChatRoom *) room;
-
-NSAttributed
-NSAttributed
+
+MVChat
+MVChat
-
-- (void) _processErrorCode:(int) errorCode withContext:(char *) context;

trunk/Chat Core/MVIRCChatConnection.m

@@ -5 +5 @@
-#import "MVIRCNumerics.h"
-#import "MVDirectChatConnectionPrivate.h"
+#import "MVChatString.h"
-
-#import "AsyncSocket.h"
-#import "InterThreadMessaging.h"
-#import "MVChatuserWatchRule.h"
-#import "MVChatPluginManager.h"
-#import "NSAttributedStringAdditions.h"
-#import "NSColorAdditions.h"
-#import "NSMethodSignatureAdditions.h"
-#import "NSNotificationAdditions.h"
@@ -17 +15 @@
-#import "NSDataAdditions.h"
-#import "MVUtilities.h"
+
+#if USE(ATTRIBUTED_CHAT_STRING)
+#import "NSAttributedStringAdditions.h"
+#endif
+
+#if ENABLE(PLUGINS)
+#import "MVChatPluginManager.h"
+#endif
-
-#define JVMinimumSendQueueDelay 0.2
@@ -209 +215 @@
-}
-
-NSAttributed
+MVChat
-        [self performSelectorOnMainThread:@selector( cancelPendingReconnectAttempts ) withObject:nil waitUntilDone:YES];
-
@@ -216 +222 @@
-
-        if( _status == MVChatConnectionConnectedStatus ) {
-[reason string]
+reason
-                        NSData *msg = [[self class] _flattenedIRCDataForMessage:reason withEncoding:[self encoding] andChatFormat:[self outgoingChatFormat]];
-                        [self sendRawMessageImmediatelyWithComponents:@"QUIT :", msg, nil];
@@ -502 +508 @@
-#pragma mark -
-
-NSAttributed
-[message string]
+MVChat
+message
-                MVSafeCopyAssign( &_awayMessage, message );
-
@@ -915 +921 @@
-#pragma mark -
-
-
+
+
-        NSString *cformat = nil;
-
@@ -934 +941 @@
-        return [message chatFormatWithOptions:options];
-}
-
-
+
+
+
+
+
+
+
-        NSParameterAssert( [target isKindOfClass:[MVChatUser class]] || [target isKindOfClass:[MVChatRoom class]] );
-
-        NSMutableData *msg = [[[self class] _flattenedIRCDataForMessage:message withEncoding:msgEncoding andChatFormat:[self outgoingChatFormat]] mutableCopyWithZone:nil];
-
+#if ENABLE(PLUGINS)
-        NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( NSMutableData * ), @encode( id ), @encode( NSDictionary * ), nil];
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
@@ -948 +961 @@
-
-        [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+#endif
+
-        if( ! [msg length] ) {
-                [msg release];
@@ -1074 +1089 @@
-
-        [self _stopSendQueue];
+
-        @synchronized( _sendQueue ) {
-                if( [_sendQueue count] )
@@ -1475 +1491 @@
-        [msgAttributes setObject:[NSNumber numberWithBool:NO] forKey:@"notice"];
-
+#if ENABLE(PLUGINS)
-        NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( NSMutableData * ), @encode( MVChatUser * ), @encode( id ), @encode( NSMutableDictionary * ), nil];
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
@@ -1484 +1501 @@
-
-        [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+#endif
+
-        if( ! [message length] ) return;
-
@@ -1546 +1565 @@
-        [msgAttributes setObject:[NSNumber numberWithBool:YES] forKey:@"notice"];
-
+#if ENABLE(PLUGINS)
-        NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( NSMutableData * ), @encode( MVChatUser * ), @encode( id ), @encode( NSMutableDictionary * ), nil];
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
@@ -1555 +1575 @@
-
-        [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+#endif
+
-        if( ! [message length] ) return;
-
@@ -1564 +1586 @@
-                if( [[sender nickname] isEqualToString:@"NickServ"] ) {
-                        NSString *msg = [self _newStringWithBytes:[message bytes] length:[message length]];
-
-                        if( [msg hasCaseInsensitiveSubstring:@"NickServ"] && [msg hasCaseInsensitiveSubstring:@"IDENTIFY"] ) {
-                                if( ! [self nicknamePassword] ) {
@@ -1655 +1676 @@
-        [[NSNotificationCenter defaultCenter] postNotificationName:( request ? MVChatConnectionSubcodeRequestNotification : MVChatConnectionSubcodeReplyNotification ) object:sender userInfo:[NSDictionary dictionaryWithObjectsAndKeys:command, @"command", arguments, @"arguments", nil]];
-
+#if ENABLE(PLUGINS)
-        NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( BOOL ), @encode( NSString * ), @encode( NSString * ), @encode( MVChatUser * ), nil];
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
@@ -1670 +1692 @@
-                return;
-        }
+#endif
-
-        if( request ) {
@@ -2106 +2129 @@
-        NSMutableData *topic = [[topicInfo objectForKey:@"topic"] mutableCopyWithZone:nil];
-
+#if ENABLE(PLUGINS)
-        NSMethodSignature *signature = [NSMethodSignature methodSignatureWithReturnAndArgumentTypes:@encode( void ), @encode( NSMutableData * ), @encode( MVChatRoom * ), @encode( MVChatUser * ), nil];
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:signature];
@@ -2114 +2138 @@
-
-        [[MVChatPluginManager defaultManager] makePluginsPerformInvocation:invocation];
+#endif
-
-        [room _setTopic:topic];