Back out the Arabeyes patch on a CVS branch, ready for a bug-fix

[PuTTY.git] / config.c

diff --git a/config.c b/config.c
index de3a6132aa26fa7dd4a9b320da5f0a33f2261e2c..ac89d3f8d7db205177622f95c2e64a154db2ba32 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1037,12 +1037,6 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
     ctrl_checkbox(s, "Disable remote-controlled character set configuration",
                  'r', HELPCTX(features_charset), dlg_stdcheckbox_handler,
                  I(offsetof(Config,no_remote_charset)));
-    ctrl_checkbox(s, "Disable Arabic text shaping",
-                 'l', HELPCTX(no_help), dlg_stdcheckbox_handler,
-                 I(offsetof(Config, arabicshaping)));
-    ctrl_checkbox(s, "Disable bidirectional text display",
-                 'j', HELPCTX(no_help), dlg_stdcheckbox_handler,
-                 I(offsetof(Config, bidi)));
 
     /*
      * The Window panel.
@@ -1292,6 +1286,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
                          'n', HELPCTX(connection_nodelay),
                          dlg_stdcheckbox_handler,
                          I(offsetof(Config,tcp_nodelay)));
+           ctrl_checkbox(s, "Enable TCP keepalives (SO_KEEPALIVE option)",
+                         'p', HELPCTX(connection_tcpkeepalive),
+                         dlg_stdcheckbox_handler,
+                         I(offsetof(Config,tcp_keepalives)));
        }
 
     }