The dummy timer isn't used anymore.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4779 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc
index 8f50cf9d4d16c83091a7f496cd2f6c6418c60e33..60254aecbfb6f10330c75aa679e2776fb0b5f77e 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.cc
+++ b/unix/xserver/hw/vnc/XserverDesktop.cc
@@ -145,7 +145,7 @@ XserverDesktop::XserverDesktop(ScreenPtr pScreen_,
                                network::TcpListener* httpListener_,
                                const char* name, const rfb::PixelFormat &pf,
                                void* fbptr, int stride)
-  : pScreen(pScreen_), deferredUpdateTimer(0), dummyTimer(0),
+  : pScreen(pScreen_), deferredUpdateTimer(0),
     server(0), httpServer(0),
     listener(listener_), httpListener(httpListener_),
     cmap(0), deferredUpdateTimerSet(false),
@@ -172,7 +172,6 @@ XserverDesktop::~XserverDesktop()
   if (!directFbptr)
     delete [] data;
   TimerFree(deferredUpdateTimer);
-  TimerFree(dummyTimer);
   delete inputDevice;
   delete httpServer;
   delete server;

diff --git a/unix/xserver/hw/vnc/XserverDesktop.h b/unix/xserver/hw/vnc/XserverDesktop.h
index fd0773ca85351b72450bfd1c8f27667f76615228..4a1705ea867aca91127317292cb18448986a5ed5 100644 (file)
--- a/unix/xserver/hw/vnc/XserverDesktop.h
+++ b/unix/xserver/hw/vnc/XserverDesktop.h
@@ -126,7 +126,7 @@ private:
   void deferUpdate();
   ScreenPtr pScreen;
   InputDevice *inputDevice;
-  OsTimerPtr deferredUpdateTimer, dummyTimer;
+  OsTimerPtr deferredUpdateTimer;
   rfb::VNCServerST* server;
   rfb::HTTPServer* httpServer;
   network::TcpListener* listener;