Skip to content

Commit

Permalink
Updates.
Browse files Browse the repository at this point in the history
— "sslcontext" command to show the SSL certificate of the active connection.
— Connection trust dialog is now a sheet window.
— Redraw dock icon on resolution changes.
— setShouldUpdateWhileOffscreen: set to NO for each WebView.
  • Loading branch information
emsquared committed Jul 16, 2012
1 parent d034fd3 commit 2c258e7
Show file tree
Hide file tree
Showing 21 changed files with 1,552 additions and 1,393 deletions.
4 changes: 4 additions & 0 deletions Classes/Controllers/TXMasterController.m
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ - (void)applicationDidChangeScreenParameters:(NSNotification *)aNotification
[self.window setFrame:windowRect display:YES animate:YES];
}
}

/* Redraw dock icon on potential screen resolution changes. */

[self.world updateIcon];
}

- (void)applicationDidBecomeActive:(NSNotification *)note
Expand Down
8 changes: 3 additions & 5 deletions Classes/Dialogs/Preferences/TDCPreferencesController.m
Original file line number Diff line number Diff line change
Expand Up @@ -582,17 +582,15 @@ - (void)onStyleChanged:(id)sender
[_NSNotificationCenter() postNotificationName:TXThemePreferenceChangedNotification object:nil userInfo:nil];
}

+ (void)openPathToThemesCallback:(NSNumber *)returnCode
+ (void)openPathToThemesCallback:(TLOPopupPromptReturnType)returnCode
{
NSString *name = [TPCViewTheme extractThemeName:[TPCPreferences themeName]];

NSInteger _returnCode = [returnCode integerValue];

if (_returnCode == NSAlertSecondButtonReturn) {
if (returnCode == TLOPopupPromptReturnSecondaryType) {
return;
}

if (_returnCode == NSAlertFirstButtonReturn) {
if (returnCode == TLOPopupPromptReturnPrimaryType) {
NSString *path = [[TPCPreferences whereThemesLocalPath] stringByAppendingPathComponent:name];

[_NSWorkspace() openFile:path];
Expand Down
7 changes: 7 additions & 0 deletions Classes/Headers/External Libraries/GCDAsyncSocketExtensions.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@

+ (BOOL)badSSLCertErrorFound:(NSError *)error;
+ (NSString *)posixErrorStringFromErrno:(NSInteger)code;

- (void)requestSSLTrustFor:(NSWindow *)docWindow
modalDelegate:(id)adelegate
didEndSelector:(SEL)didEndSelector
contextInfo:(void *)contextInfo
defaultButton:(NSString *)defaultButton
alternateButton:(NSString *)alternateButton;
@end

@interface AsyncSocket (RLMAsyncSocketExtensions)
Expand Down
1 change: 1 addition & 0 deletions Classes/Headers/IRC.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
#define IRCCommandIndexSend @"SEND"
#define IRCCommandIndexServer @"SERVER"
#define IRCCommandIndexShun @"SHUN"
#define IRCCommandIndexSslcontext @"SSLCONTEXT"
#define IRCCommandIndexT @"T"
#define IRCCommandIndexTempshun @"TEMPSHUN"
#define IRCCommandIndexTime @"TIME"
Expand Down
16 changes: 11 additions & 5 deletions Classes/Headers/TLOPopupPrompts.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,24 @@

#define TXPopupPromptSuppressionPrefix @"Text Input Prompt Suppression -> "

@interface TLOPopupPrompts : NSObject
+ (void)popupPromptNULLSelector:(NSInteger)returnCode;
typedef enum TLOPopupPromptReturnType : NSInteger {
TLOPopupPromptReturnPrimaryType,
TLOPopupPromptReturnSecondaryType,
TLOPopupPromptReturnOtherType,
} TLOPopupPromptReturnType;

+ (BOOL)dialogWindowWithQuestion:(NSString *)bodyText
@interface TLOPopupPrompts : NSObject
+ (void)popupPromptNilSelector:(TLOPopupPromptReturnType)returnCode;

+ (BOOL)dialogWindowWithQuestion:(NSString *)bodyText
title:(NSString *)titleText
defaultButton:(NSString *)buttonDefault
alternateButton:(NSString *)buttonAlternate
otherButton:(NSString *)otherButton
suppressionKey:(NSString *)suppressKey
suppressionText:(NSString *)suppressText;

+ (NSString *)dialogWindowWithInput:(NSString *)bodyText
+ (NSString *)dialogWindowWithInput:(NSString *)bodyText
title:(NSString *)titleText
defaultButton:(NSString *)buttonDefault
alternateButton:(NSString *)buttonAlternate
Expand All @@ -25,7 +31,7 @@
- (void)sheetWindowWithQuestion:(NSWindow *)window
target:(id)targetClass
action:(SEL)actionSelector
body:(NSString *)bodyText
body:(NSString *)bodyText
title:(NSString *)titleText
defaultButton:(NSString *)buttonDefault
alternateButton:(NSString *)buttonAlternate
Expand Down
6 changes: 6 additions & 0 deletions Classes/Headers/TLOSocketClient.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@

- (NSData *)readLine;
- (void)write:(NSData *)data;

- (void)openSSLCertificateTrustDialog;

/* openSSLCertificateTrustDialog: results are not guaranteed
when supplied with a suppression key. Pass nil to it for now. */
- (void)openSSLCertificateTrustDialog:(NSString *)suppressKey;
@end

@interface NSObject (TCPClientDelegate)
Expand Down
Loading

0 comments on commit 2c258e7

Please sign in to comment.