Make SDesktop::start()/stop() optional

Let's avoid requring these as a desktop implementation can now set up
everything in the init() method.

diff --git a/common/rfb/SDesktop.h b/common/rfb/SDesktop.h
index e3871616cb09022ca08254bb2b08bf26382912b0..560ee7ff220de3d015daea1ddfd631811c5e897c 100644 (file)
--- a/common/rfb/SDesktop.h
+++ b/common/rfb/SDesktop.h
@@ -58,14 +58,12 @@ namespace rfb {
     // needed when there are no clients.  A valid PixelBuffer must have been
     // set via the VNCServer's setPixelBuffer() method by the time this call
     // returns.
-
-    virtual void start() = 0;
+    virtual void start() {}
 
     // stop() is called by the server when there are no longer any
     // authenticated clients, and therefore the desktop can cease any
     // expensive tasks.
-
-    virtual void stop() = 0;
+    virtual void stop() {}
 
     // queryConnection() is called when a connection has been
     // successfully authenticated.  The sock and userName arguments
@@ -143,10 +141,6 @@ namespace rfb {
       server = vs;
       server->setPixelBuffer(buffer);
     }
-    virtual void start() {
-    }
-    virtual void stop() {
-    }
     virtual void queryConnection(network::Socket* sock,
                                  const char* /*userName*/) {
       server->approveConnection(sock, true, NULL);

diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index 7de6143ba981f0b0956c98836340bb745beefa18..c4117c74dde8916c95c91b6d5f2f34b105f769e4 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -151,14 +151,6 @@ void XserverDesktop::init(rfb::VNCServer* vs)
   // ready state
 }
 
-void XserverDesktop::start()
-{
-}
-
-void XserverDesktop::stop()
-{
-}
-
 void XserverDesktop::queryConnection(network::Socket* sock,
                                      const char* userName)
 {

diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
index 6c4f0b68f630e0bac8ceee7e16eda623d734bf61..3cac2121198cbcbd38fb50177a8568a486592cb9 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.h
+++ b/unix/xserver/hw/vnc/XserverDesktop.h
@@ -89,8 +89,6 @@ public:
 
   // rfb::SDesktop callbacks
   virtual void init(rfb::VNCServer* vs);
-  virtual void start();
-  virtual void stop();
   virtual void terminate();
   virtual void queryConnection(network::Socket* sock,
                                const char* userName);