X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/3e547dd894f24efdcf306aa019988eb683f63945..63be776775f6859bc185f2fbc00da5d16710fde7:/config.c

diff --git a/config.c b/config.c
index fd5cb958..3189c0bd 100644
--- a/config.c
+++ b/config.c
@@ -1295,15 +1295,16 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 	ctrl_settitle(b, "Connection/Proxy",
 		      "Options controlling proxy usage");
 
-	s = ctrl_getset(b, "Connection/Proxy", "basics", "Proxy basics");
-	ctrl_radiobuttons(s, "Proxy type:", NO_SHORTCUT, 4,
+	s = ctrl_getset(b, "Connection/Proxy", "basics", NULL);
+	ctrl_radiobuttons(s, "Proxy type:", 't', 3,
 			  HELPCTX(proxy_type),
 			  dlg_stdradiobutton_handler,
 			  I(offsetof(Config, proxy_type)),
-			  "None", 'n', I(PROXY_NONE),
-			  "HTTP", 't', I(PROXY_HTTP),
-			  "SOCKS", 's', I(PROXY_SOCKS),
-			  "Telnet", 'l', I(PROXY_TELNET),
+			  "None", I(PROXY_NONE),
+			  "SOCKS 4", I(PROXY_SOCKS4),
+			  "SOCKS 5", I(PROXY_SOCKS5),
+			  "HTTP", I(PROXY_HTTP),
+			  "Telnet", I(PROXY_TELNET),
 			  NULL);
 	ctrl_columns(s, 2, 80, 20);
 	c = ctrl_editbox(s, "Proxy hostname", 'y', 100,
@@ -1346,19 +1347,11 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			 I(offsetof(Config,proxy_password)),
 			 I(sizeof(((Config *)0)->proxy_password)));
 	c->editbox.password = 1;
-
-	s = ctrl_getset(b, "Connection/Proxy", "misc",
-			"Miscellaneous proxy settings");
 	ctrl_editbox(s, "Telnet command", 'm', 100,
 		     HELPCTX(proxy_command),
 		     dlg_stdeditbox_handler,
 		     I(offsetof(Config,proxy_telnet_command)),
 		     I(sizeof(((Config *)0)->proxy_telnet_command)));
-	ctrl_radiobuttons(s, "SOCKS Version", 'v', 2,
-			  HELPCTX(proxy_socksver),
-			  dlg_stdradiobutton_handler,
-			  I(offsetof(Config, proxy_socks_version)),
-			  "Version 5", I(5), "Version 4", I(4), NULL);
     }
 
     /*
@@ -1501,7 +1494,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			  cipherlist_handler, P(NULL));
 	c->listbox.height = 6;
 	
-	ctrl_checkbox(s, "Enable non-standard use of single-DES in SSH 2", 'i',
+	ctrl_checkbox(s, "Enable legacy use of single-DES in SSH 2", 'i',
 		      HELPCTX(ssh_ciphers),
 		      dlg_stdcheckbox_handler,
 		      I(offsetof(Config,ssh2_des_cbc)));