Assume the server supports the QNOP command, do not test for it, this is another...

diff --git a/textclient/citadel_ipc.c b/textclient/citadel_ipc.c
index bcabb468ebed9ef1bd857bc7b208b1f1e224cde9..dc8976444a71ff5f27b3ac62081aafac94cbb5a8 100644 (file)
--- a/textclient/citadel_ipc.c
+++ b/textclient/citadel_ipc.c
@@ -834,9 +834,6 @@ int CtdlIPCServerInfo(CtdlIPC * ipc, char *cret)
                        case 10:
                                ipc->ServInfo.ok_floors = atoi(buf);
                                break;
-                       case 13:
-                               ipc->ServInfo.supports_qnop = atoi(buf);
-                               break;
                        case 14:
                                ipc->ServInfo.supports_ldap = atoi(buf);
                                break;

diff --git a/textclient/commands.c b/textclient/commands.c
index c8d920a3dbac0740395a92fbfa43d3bd1c98b4df..cecbb4d1fa5d073e3263848785db50d243afee46 100644 (file)
--- a/textclient/commands.c
+++ b/textclient/commands.c
@@ -627,10 +627,8 @@ static void really_do_keepalive(void) {
                }
        }
 
-       // If half keepalives are enabled, send a QNOP to the server (if the
-       // server supports it) and then do nothing.
-       if ((keepalives_enabled == KA_HALF)
-           && (ipc_for_signal_handlers->ServInfo.supports_qnop > 0)) {
+       // If half keepalives are enabled, send a QNOP to the server, then do nothing.
+       if (keepalives_enabled == KA_HALF) {
                CtdlIPC_chat_send(ipc_for_signal_handlers, "QNOP");
        }
 }

diff --git a/textclient/textclient.h b/textclient/textclient.h
index a13f4ae3dbb78b076b71e64a618b644a864d936c..169f6935dac0bedac8aa14fcce90eb6b914e96d8 100644 (file)
--- a/textclient/textclient.h
+++ b/textclient/textclient.h
@@ -141,7 +141,6 @@ struct CtdlServInfo {
        char sysadm[64];
        char moreprompt[256];
        int ok_floors;
-       int supports_qnop;
        int supports_ldap;
        int newuser_disabled;
        char default_cal_zone[256];