diff options
| author | Pierre Ossman <ossman@cendio.se> | 2011-11-08 10:31:04 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2011-11-08 10:31:04 +0000 |
| commit | bfd47f17db65d188b03d932ffba20b298bf6bad7 (patch) | |
| tree | acfc828c81ee7be76ed807334f89a444462416ca | |
| parent | 4f6286c9d104030a5fcf272cbfd628f06d6f2032 (diff) | |
| download | tigervnc-bfd47f17db65d188b03d932ffba20b298bf6bad7.tar.gz tigervnc-bfd47f17db65d188b03d932ffba20b298bf6bad7.zip | |
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
| -rw-r--r-- | unix/xserver/hw/vnc/XserverDesktop.cc | 3 | ||||
| -rw-r--r-- | unix/xserver/hw/vnc/XserverDesktop.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/unix/xserver/hw/vnc/XserverDesktop.cc b/unix/xserver/hw/vnc/XserverDesktop.cc index 8f50cf9d..60254aec 100644 --- 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 fd0773ca..4a1705ea 100644 --- 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; |