Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Use SASL if the server supports it

  • Loading branch information...
commit 4bf5a5fc5b703e4183d22d4a1955eae4dd59d567 1 parent d679bba
@kylef kylef authored
View
5 Classes/Dialogs/ServerSheet.m
@@ -68,7 +68,6 @@ @implementation ServerSheet
@synthesize realNameText;
@synthesize sleepQuitMessageText;
@synthesize sslCheck;
-@synthesize saslCheck;
@synthesize tabView;
@synthesize uid;
@synthesize usernameText;
@@ -246,7 +245,6 @@ - (void)load
passwordText.stringValue = config.password;
portText.integerValue = config.port;
sslCheck.state = config.useSSL;
- saslCheck.state = config.useSASL;
bouncerModeCheck.state = config.bouncerMode;
autoConnectCheck.state = config.autoConnect;
autoReconnectCheck.state = config.autoReconnect;
@@ -347,7 +345,6 @@ - (void)save
}
config.useSSL = sslCheck.state;
- config.useSASL = saslCheck.state;
/* Identity */
config.nick = nickText.stringValue;
@@ -911,4 +908,4 @@ - (void)windowWillClose:(NSNotification *)note
}
}
-@end
+@end
View
4 Classes/Headers/IRCClientConfig.h
@@ -26,7 +26,6 @@ NSComparisonResult channelDataSort(IRCChannel *s1, IRCChannel *s2, void *context
NSString *network;
BOOL useSSL;
- BOOL useSASL;
NSString *nick;
NSString *password;
@@ -69,7 +68,6 @@ NSComparisonResult channelDataSort(IRCChannel *s1, IRCChannel *s2, void *context
@property (nonatomic, retain) NSString *host;
@property (nonatomic, assign) NSInteger port;
@property (nonatomic, assign) BOOL useSSL;
-@property (nonatomic, assign) BOOL useSASL;
@property (nonatomic, retain) NSString *nick;
@property (nonatomic, retain) NSString *password;
@property (nonatomic, retain) NSString *username;
@@ -104,4 +102,4 @@ NSComparisonResult channelDataSort(IRCChannel *s1, IRCChannel *s2, void *context
- (NSMutableDictionary *)dictionaryValue;
- (void)destroyKeychains;
-@end
+@end
View
4 Classes/Headers/ServerSheet.h
@@ -39,7 +39,6 @@
IBOutlet NSComboBox *hostCombo;
IBOutlet NSTextField *portText;
IBOutlet NSButton *sslCheck;
- IBOutlet NSButton *saslCheck;
IBOutlet NSTextField *nickText;
IBOutlet NSTextField *passwordText;
@@ -102,7 +101,6 @@
@property (nonatomic, retain) NSButton *autoConnectCheck;
@property (nonatomic, retain) NSComboBox *hostCombo;
@property (nonatomic, retain) NSButton *sslCheck;
-@property (nonatomic, retain) NSButton *saslCheck;
@property (nonatomic, retain) NSTextField *portText;
@property (nonatomic, retain) NSTextField *nickText;
@property (nonatomic, retain) NSTextField *passwordText;
@@ -162,4 +160,4 @@
@interface NSObject (ServerSheetDelegate)
- (void)ServerSheetOnOK:(ServerSheet *)sender;
- (void)ServerSheetWillClose:(ServerSheet *)sender;
-@end
+@end
View
2  Classes/IRC/IRCClient.m
@@ -4397,7 +4397,7 @@ - (BOOL)isCapAvailable:(NSString*)cap
[cap isEqualNoCase:@"multi-prefix"] ||
[cap isEqualNoCase:@"userhost-in-names"] ||
//[cap isEqualNoCase:@"znc.in/server-time"] ||
- ([cap isEqualNoCase:@"sasl"] && NSObjectIsNotEmpty(config.nickPassword) && config.useSASL));
+ ([cap isEqualNoCase:@"sasl"] && NSObjectIsNotEmpty(config.nickPassword)));
}
- (void)cap:(NSString*)cap result:(BOOL)supported
View
5 Classes/IRC/IRCClientConfig.m
@@ -40,7 +40,6 @@ @implementation IRCClientConfig
@synthesize sleepQuitMessage;
@synthesize username;
@synthesize useSSL;
-@synthesize useSASL;
@synthesize outgoingFloodControl;
@synthesize floodControlMaximumMessages;
@synthesize floodControlDelayTimerInterval;
@@ -228,7 +227,6 @@ - (id)initWithDictionary:(NSDictionary *)dic
}
useSSL = [dic boolForKey:@"ssl"];
- useSASL = [dic boolForKey:@"sasl"];
if ([dic stringForKey:@"username"]) {
[username drain];
@@ -343,7 +341,6 @@ - (NSMutableDictionary *)dictionaryValue
[dic setInteger:fallbackEncoding forKey:@"fallback_encoding"];
[dic setBool:useSSL forKey:@"ssl"];
- [dic setBool:useSASL forKey:@"sasl"];
[dic setBool:prefersIPv6 forKey:@"prefersIPv6"];
[dic setBool:autoConnect forKey:@"auto_connect"];
[dic setBool:autoReconnect forKey:@"auto_reconnect"];
@@ -396,4 +393,4 @@ - (id)mutableCopyWithZone:(NSZone *)zone
return [[IRCClientConfig allocWithZone:zone] initWithDictionary:[self dictionaryValue]];
}
-@end
+@end
View
714 English.lproj/ServerSheet.xib
371 additions, 343 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.