diff --git a/macosx/Controller.m b/macosx/Controller.m
index 2bf566d8f..0fabbce7c 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -320,11 +320,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
tr_bencDictAddBool(&settings, TR_PREFS_KEY_PEX_ENABLED, [fDefaults boolForKey: @"PEXGlobal"]);
tr_bencDictAddBool(&settings, TR_PREFS_KEY_PORT_FORWARDING, [fDefaults boolForKey: @"NatTraversal"]);
- tr_bencDictAddBool(&settings, TR_PREFS_KEY_PROXY_AUTH_ENABLED, [fDefaults boolForKey: @"ProxyAuthorize"]);
- tr_bencDictAddBool(&settings, TR_PREFS_KEY_PROXY_ENABLED, [fDefaults boolForKey: @"Proxy"]);
- tr_bencDictAddInt(&settings, TR_PREFS_KEY_PROXY_PORT, [fDefaults integerForKey: @"ProxyPort"]);
- tr_bencDictAddStr(&settings, TR_PREFS_KEY_PROXY, [[fDefaults stringForKey: @"ProxyAddress"] UTF8String]);
- tr_bencDictAddStr(&settings, TR_PREFS_KEY_PROXY_USERNAME, [[fDefaults stringForKey: @"ProxyUsername"] UTF8String]);
tr_bencDictAddReal(&settings, TR_PREFS_KEY_RATIO, [fDefaults floatForKey: @"RatioLimit"]);
tr_bencDictAddBool(&settings, TR_PREFS_KEY_RATIO_ENABLED, [fDefaults boolForKey: @"RatioCheck"]);
tr_bencDictAddBool(&settings, TR_PREFS_KEY_RENAME_PARTIAL_FILES, [fDefaults boolForKey: @"RenamePartialFiles"]);
diff --git a/macosx/Defaults.plist b/macosx/Defaults.plist
index 4db670d4a..22b0942d4 100644
--- a/macosx/Defaults.plist
+++ b/macosx/Defaults.plist
@@ -110,18 +110,6 @@
PlaySeedingSound
- Proxy
-
- ProxyAddress
-
- ProxyAuthorize
-
- ProxyPort
- 80
- ProxyType
- HTTP
- ProxyUsername
-
Queue
QueueDownloadNumber
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index 33fa5d603..3318d0816 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -54,9 +54,6 @@
NSTimer * fPortStatusTimer;
int fPeerPort, fNatStatus;
- IBOutlet NSTextField * fProxyAddressField, * fProxyPortField, * fProxyPasswordField;
- IBOutlet NSPopUpButton * fProxyTypePopUp;
-
IBOutlet NSTextField * fRPCPortField, * fRPCPasswordField;
IBOutlet NSTableView * fRPCWhitelistTable;
NSMutableArray * fRPCWhitelistArray;
@@ -139,16 +136,6 @@
- (void) setAutoSize: (id) sender;
-- (void) setProxyEnabled: (id) sender;
-- (void) setProxyAddress: (id) sender;
-- (void) setProxyPort: (id) sender;
-- (void) setProxyType: (id) sender;
-- (void) updateProxyType;
-- (void) setProxyAuthorize: (id) sender;
-- (void) setProxyUsername: (id) sender;
-- (void) setProxyPassword: (id) sender;
-- (void) updateProxyPassword;
-
- (void) setRPCEnabled: (id) sender;
- (void) linkWebUI: (id) sender;
- (void) setRPCAuthorize: (id) sender;
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 932928ff8..b754b717e 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -39,10 +39,6 @@
#define DOWNLOAD_FOLDER 0
#define DOWNLOAD_TORRENT 2
-#define PROXY_HTTP 0
-#define PROXY_SOCKS4 1
-#define PROXY_SOCKS5 2
-
#define RPC_IP_ADD_TAG 0
#define RPC_IP_REMOVE_TAG 1
@@ -54,9 +50,6 @@
#define TOOLBAR_NETWORK @"TOOLBAR_NETWORK"
#define TOOLBAR_REMOTE @"TOOLBAR_REMOTE"
-#define PROXY_KEYCHAIN_SERVICE "Transmission:Proxy"
-#define PROXY_KEYCHAIN_NAME "Proxy"
-
#define RPC_KEYCHAIN_SERVICE "Transmission:Remote"
#define RPC_KEYCHAIN_NAME "Remote"
@@ -118,10 +111,6 @@ tr_session * fHandle;
//set encryption
[self setEncryptionMode: nil];
- //set proxy type
- [self updateProxyType];
- [self updateProxyPassword];
-
//update rpc whitelist
[self updateRPCPassword];
@@ -210,31 +199,6 @@ tr_session * fHandle;
[fQueueSeedField setIntValue: [fDefaults integerForKey: @"QueueSeedNumber"]];
[fStalledField setIntValue: [fDefaults integerForKey: @"StalledMinutes"]];
- //set proxy type
- [fProxyAddressField setStringValue: [fDefaults stringForKey: @"ProxyAddress"]];
- NSInteger proxyType;
- switch (tr_sessionGetProxyType(fHandle))
- {
- case TR_PROXY_SOCKS4:
- proxyType = PROXY_SOCKS4;
- break;
- case TR_PROXY_SOCKS5:
- proxyType = PROXY_SOCKS5;
- break;
- case TR_PROXY_HTTP:
- proxyType = PROXY_HTTP;
- break;
- default:
- NSAssert(NO, @"Unknown proxy type received");
- }
- [fProxyTypePopUp selectItemAtIndex: proxyType];
-
- //set proxy password - does NOT need to be released
- [fProxyPasswordField setStringValue: [NSString stringWithUTF8String: tr_sessionGetProxyPassword(fHandle)]];
-
- //set proxy port
- [fProxyPortField setIntValue: [fDefaults integerForKey: @"ProxyPort"]];
-
//set blocklist
[self updateBlocklistFields];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateBlocklistFields)
@@ -829,107 +793,6 @@ tr_session * fHandle;
[[NSNotificationCenter defaultCenter] postNotificationName: @"AutoSizeSettingChange" object: self];
}
-- (void) setProxyEnabled: (id) sender
-{
- tr_sessionSetProxyEnabled(fHandle, [fDefaults boolForKey: @"Proxy"]);
-}
-
-- (void) setProxyAddress: (id) sender
-{
- NSString * address = [sender stringValue];
- tr_sessionSetProxy(fHandle, [address UTF8String]);
- [fDefaults setObject: address forKey: @"ProxyAddress"];
-}
-
-- (void) setProxyPort: (id) sender
-{
- int port = [sender intValue];
- [fDefaults setInteger: port forKey: @"ProxyPort"];
- tr_sessionSetProxyPort(fHandle, port);
-}
-
-- (void) setProxyType: (id) sender
-{
- NSString * type;
- switch ([sender indexOfSelectedItem])
- {
- case PROXY_HTTP:
- type = @"HTTP";
- break;
- case PROXY_SOCKS4:
- type = @"SOCKS4";
- break;
- case PROXY_SOCKS5:
- type = @"SOCKS5";
- break;
- default:
- NSAssert1(NO, @"Unknown index %d received for proxy type", [sender indexOfSelectedItem]);
- }
-
- [fDefaults setObject: type forKey: @"ProxyType"];
- [self updateProxyType];
-}
-
-- (void) updateProxyType
-{
- NSString * typeString = [fDefaults stringForKey: @"ProxyType"];
- tr_proxy_type type;
- if ([typeString isEqualToString: @"SOCKS4"])
- type = TR_PROXY_SOCKS4;
- else if ([typeString isEqualToString: @"SOCKS5"])
- type = TR_PROXY_SOCKS5;
- else
- {
- //safety
- if (![typeString isEqualToString: @"HTTP"])
- {
- typeString = @"HTTP";
- [fDefaults setObject: typeString forKey: @"ProxyType"];
- }
- type = TR_PROXY_HTTP;
- }
-
- tr_sessionSetProxyType(fHandle, type);
-}
-
-- (void) setProxyAuthorize: (id) sender
-{
- BOOL enable = [fDefaults boolForKey: @"ProxyAuthorize"];
- tr_sessionSetProxyAuthEnabled(fHandle, enable);
-}
-
-- (void) setProxyUsername: (id) sender
-{
- tr_sessionSetProxyUsername(fHandle, [[fDefaults stringForKey: @"ProxyUsername"] UTF8String]);
-}
-
-- (void) setProxyPassword: (id) sender
-{
- const char * password = [[sender stringValue] UTF8String];
- [self setKeychainPassword: password forService: PROXY_KEYCHAIN_SERVICE username: PROXY_KEYCHAIN_NAME];
-
- tr_sessionSetProxyPassword(fHandle, password);
-}
-
-- (void) updateProxyPassword
-{
- UInt32 passwordLength;
- const char * password = nil;
- SecKeychainFindGenericPassword(NULL, strlen(PROXY_KEYCHAIN_SERVICE), PROXY_KEYCHAIN_SERVICE,
- strlen(PROXY_KEYCHAIN_NAME), PROXY_KEYCHAIN_NAME, &passwordLength, (void **)&password, NULL);
-
- if (password != NULL)
- {
- char fullPassword[passwordLength+1];
- strncpy(fullPassword, password, passwordLength);
- fullPassword[passwordLength] = '\0';
- SecKeychainItemFreeContent(NULL, (void *)password);
-
- tr_sessionSetProxyPassword(fHandle, fullPassword);
- [fProxyPasswordField setStringValue: [NSString stringWithUTF8String: fullPassword]];
- }
-}
-
- (void) setRPCEnabled: (id) sender
{
BOOL enable = [fDefaults boolForKey: @"RPC"];
diff --git a/macosx/TransmissionHelp/TransmissionHelp.helpindex b/macosx/TransmissionHelp/TransmissionHelp.helpindex
index 59018f193..d669ef780 100644
Binary files a/macosx/TransmissionHelp/TransmissionHelp.helpindex and b/macosx/TransmissionHelp/TransmissionHelp.helpindex differ
diff --git a/macosx/TransmissionHelp/html/network.html b/macosx/TransmissionHelp/html/network.html
index 03fceddcb..c8a3f93d7 100644
--- a/macosx/TransmissionHelp/html/network.html
+++ b/macosx/TransmissionHelp/html/network.html
@@ -23,14 +23,6 @@
You haven't port forwarded correctly. Port forwarding opens a port in your firewall or router so that incoming connections from the outside world can be made with Transmission. If the port is forwarded, other people in the torrent can see you, thus increasing your potential number of connections, which more importantly, might increase the speed of your download.
You need to port forward if you share your internet connection with a router, or if your broadband modem is a router itself. In most cases Transmission can do this automatically, see this page for instructions on port forwarding.
-
-
What is a 'Tracker Proxy'?
-
- Using a proxy for connections to the tracker means that instead of connecting directly to the tracker, you connect to some other proxy server, which in turn connects to the tracker itself. Thus the tracker will see the proxy IP address as the source address rather than your own.
-
Using a proxy may increase your privacy somewhat, making it harder for third parties to monitor your activity. However, using a proxy slows down tracker communication as notifications are no longer sent directly.
-
If you want to use a proxy, enter its address and authenticate as necessary.
-
-
diff --git a/macosx/de.lproj/PrefsWindow.xib b/macosx/de.lproj/PrefsWindow.xib
index a5b7abfba..9a3f508c3 100644
--- a/macosx/de.lproj/PrefsWindow.xib
+++ b/macosx/de.lproj/PrefsWindow.xib
@@ -2,9 +2,9 @@