Merge branch 'present' of github.com:CendioOssman/tigervnc

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

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

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

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

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

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

diff --cc common/rfb/VNCServerST.h
index d303831e8dc605fa47d72fcb0fe84bc4e49d8fef,3436d333f0dbc29786262fbc95c70f5d0a2db446..90c8d7539525b2c68d3eae3924b02f8b1a046a4f
--- 1/common/rfb/VNCServerST.h
--- 2/common/rfb/VNCServerST.h
+++ b/common/rfb/VNCServerST.h
@@@ -77,8 -76,13 +77,10 @@@ namespace rfb 
      //   Flush pending data from the Socket on to the network.
      virtual void processSocketWriteEvent(network::Socket* sock);
  
 -
 -    // Methods overridden from VNCServer
 -
      virtual void blockUpdates();
      virtual void unblockUpdates();
+     virtual uint64_t getMsc();
+     virtual void queueMsc(uint64_t target);
      virtual void setPixelBuffer(PixelBuffer* pb, const ScreenSet& layout);
      virtual void setPixelBuffer(PixelBuffer* pb);
      virtual void setScreenLayout(const ScreenSet& layout);

diff --cc unix/vncconfig/vncconfig.cxx
Simple merge

diff --cc unix/x0vncserver/XDesktop.cxx
Simple merge

diff --cc unix/xserver/hw/vnc/XserverDesktop.cc
Simple merge

diff --cc unix/xserver/hw/vnc/XserverDesktop.h
index 9cc5bf792e96b82146ba868fffdc7e750353f8d1,f3c684c7f945eaf7094f55061dac33316ae6774e..e604295b0ab0386c4f46a7477798c71317768e9d
--- 1/unix/xserver/hw/vnc/XserverDesktop.h
--- 2/unix/xserver/hw/vnc/XserverDesktop.h
+++ b/unix/xserver/hw/vnc/XserverDesktop.h
@@@ -107,12 -110,12 +110,12 @@@ public
  protected:
    bool handleListenerEvent(int fd,
                             std::list<network::SocketListener*>* sockets,
 -                           network::SocketServer* sockserv);
 +                           rfb::VNCServer* sockserv);
    bool handleSocketEvent(int fd,
 -                         network::SocketServer* sockserv,
 +                         rfb::VNCServer* sockserv,
                           bool read, bool write);
  
-   virtual bool handleTimeout(rfb::Timer* t);
+   virtual void handleTimeout(rfb::Timer* t);
  
  private:
  

diff --cc unix/xserver/hw/vnc/vncExtInit.cc
Simple merge

diff --cc unix/xserver/hw/vnc/vncExtInit.h
Simple merge

diff --cc vncviewer/vncviewer.cxx
Simple merge

diff --cc win/rfb_win32/SocketManager.cxx
Simple merge