Merge branch 'autoclip' of https://github.com/CendioOssman/tigervnc

diff --cc common/rfb/CConnection.cxx
Simple merge

diff --cc common/rfb/CConnection.h
Simple merge

diff --cc common/rfb/SConnection.cxx
index 1c9ca3e705cbb992622cbe2cfb3a7052716cb719,683d29b60572182d73626fadc87153eca923e4c7..8277844c65102b47abf4daef2d854c01f050fd41
--- 1/common/rfb/SConnection.cxx
--- 2/common/rfb/SConnection.cxx
+++ b/common/rfb/SConnection.cxx
@@@ -51,10 -51,11 +51,11 @@@ const SConnection::AccessRights SConnec
  
  SConnection::SConnection()
    : readyForSetColourMapEntries(false),
 -    is(0), os(0), reader_(0), writer_(0),
 -    ssecurity(0), state_(RFBSTATE_UNINITIALISED),
 -    preferredEncoding(encodingRaw),
 +    is(0), os(0), reader_(0), writer_(0), ssecurity(0),
 +    authFailureTimer(this, &SConnection::handleAuthFailureTimeout),
 +    state_(RFBSTATE_UNINITIALISED), preferredEncoding(encodingRaw),
-     clientClipboard(NULL), hasLocalClipboard(false)
+     clientClipboard(NULL), hasLocalClipboard(false),
+     unsolicitedClipboardAttempt(false)
  {
    defaultMajorVersion = 3;
    defaultMinorVersion = 8;

diff --cc common/rfb/SConnection.h
Simple merge

diff --cc common/rfb/VNCServerST.cxx
index 85368afe325d51a8186daf1c480c9aad755f47be,ae51a61b1118bb6aa743611b87a00141db36c8df..b32cac594d0e39592448292b3727110dfa155826
--- 1/common/rfb/VNCServerST.cxx
--- 2/common/rfb/VNCServerST.cxx
+++ b/common/rfb/VNCServerST.cxx
@@@ -171,11 -169,9 +171,11 @@@ void VNCServerST::removeSocket(network:
        if (pointerClient == *ci)
          pointerClient = NULL;
        if (clipboardClient == *ci)
-         clipboardClient = NULL;
+         handleClipboardAnnounce(*ci, false);
        clipboardRequestors.remove(*ci);
  
 +      CharArray name(strDup((*ci)->getPeerEndpoint()));
 +
        // - Delete the per-Socket resources
        delete *ci;
  

diff --cc vncviewer/Viewport.cxx
Simple merge