Force common flow of connection queries

Force queryConnection() to always call back to approveConnection()
rather than return special values. This makes the flow easier to
follow as it will be the same in all cases.

1 files changed, 4 insertions, 6 deletions

diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index c08572be..9b84ca29 100644
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -87,12 +87,11 @@ public:
   ~QueryConnHandler() { delete queryConnectDialog; }
 
   // -=- VNCServerST::QueryConnectionHandler interface
-  virtual VNCServerST::queryResult queryConnection(network::Socket* sock,
-                                                   const char* userName,
-                                                   char** reason) {
+  virtual void queryConnection(network::Socket* sock,
+                               const char* userName) {
     if (queryConnectSock) {
-      *reason = strDup("Another connection is currently being queried.");
-      return VNCServerST::REJECT;
+      server->approveConnection(sock, false, "Another connection is currently being queried.");
+      return;
     }
     if (!userName) userName = "(anonymous)";
     queryConnectSock = sock;
@@ -102,7 +101,6 @@ public:
                                                 userName, queryConnectTimeout,
                                                 this);
     queryConnectDialog->map();
-    return VNCServerST::PENDING;
   }
 
   // -=- QueryResultCallback interface