don't append "http" to addresses in the proxy address field
This commit is contained in:
parent
73eb503b4c
commit
00ab31b454
|
@ -715,23 +715,11 @@ tr_handle * fHandle;
|
||||||
- (void) setProxyAddress: (id) sender
|
- (void) setProxyAddress: (id) sender
|
||||||
{
|
{
|
||||||
NSString * address = [sender stringValue];
|
NSString * address = [sender stringValue];
|
||||||
BOOL blank = [address isEqualToString: @""];
|
|
||||||
|
|
||||||
if (!blank && [address rangeOfString: @"://"].location == NSNotFound)
|
|
||||||
address = [@"http://" stringByAppendingString: address];
|
|
||||||
|
|
||||||
if (blank || tr_httpIsValidURL([address UTF8String]))
|
|
||||||
{
|
|
||||||
tr_sessionSetProxy(fHandle, [address UTF8String]);
|
tr_sessionSetProxy(fHandle, [address UTF8String]);
|
||||||
[sender setStringValue: address];
|
[sender setStringValue: address];
|
||||||
[fDefaults setObject: address forKey: @"ProxyAddress"];
|
[fDefaults setObject: address forKey: @"ProxyAddress"];
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
NSBeep();
|
|
||||||
[sender setStringValue: [fDefaults stringForKey: @"ProxyAddress"]];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
- (void) setProxyPort: (id) sender
|
- (void) setProxyPort: (id) sender
|
||||||
{
|
{
|
||||||
|
|
|
@ -750,7 +750,7 @@
|
||||||
for (NSInteger i = start ? 1 : 0; i < numberOfRects; i += 2)
|
for (NSInteger i = start ? 1 : 0; i < numberOfRects; i += 2)
|
||||||
{
|
{
|
||||||
NSRectFill(visibleRect);
|
NSRectFill(visibleRect);
|
||||||
visibleRect.origin.y += 2 * height;
|
visibleRect.origin.y += 2.0 * height;
|
||||||
}
|
}
|
||||||
|
|
||||||
[super highlightSelectionInClipRect: clipRect];
|
[super highlightSelectionInClipRect: clipRect];
|
||||||
|
|
|
@ -96,7 +96,7 @@
|
||||||
for (NSInteger i = start ? 1 : 0; i < numberOfRects; i += 2)
|
for (NSInteger i = start ? 1 : 0; i < numberOfRects; i += 2)
|
||||||
{
|
{
|
||||||
NSRectFill(visibleRect);
|
NSRectFill(visibleRect);
|
||||||
visibleRect.origin.y += 2 * height;
|
visibleRect.origin.y += 2.0 * height;
|
||||||
}
|
}
|
||||||
|
|
||||||
[super highlightSelectionInClipRect: clipRect];
|
[super highlightSelectionInClipRect: clipRect];
|
||||||
|
|
Loading…
Reference in New Issue