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

5 files changed, 6 insertions, 10 deletions

diff --git a/vncviewer/EmulateMB.cxx b/vncviewer/EmulateMB.cxx
index 72335eb8..cc680df4 100644
--- a/vncviewer/EmulateMB.cxx
+++ b/vncviewer/EmulateMB.cxx
@@ -277,13 +277,13 @@ void EmulateMB::filterPointerEvent(const rfb::Point& pos, int buttonMask)
   }
 }
 
-bool EmulateMB::handleTimeout(rfb::Timer *t)
+void EmulateMB::handleTimeout(rfb::Timer *t)
 {
   int action1, action2;
   int buttonMask;
 
   if (&timer != t)
-    return false;
+    return;
 
   if ((state > 10) || (state < 0))
     throw rfb::Exception(_("Invalid state for 3 button emulation"));
@@ -310,8 +310,6 @@ bool EmulateMB::handleTimeout(rfb::Timer *t)
   }
 
   state = stateTab[state][4][2];
-
-  return false;
 }
 
 void EmulateMB::sendAction(const rfb::Point& pos, int buttonMask, int action)
diff --git a/vncviewer/EmulateMB.h b/vncviewer/EmulateMB.h
index 132f44fe..77fdec66 100644
--- a/vncviewer/EmulateMB.h
+++ b/vncviewer/EmulateMB.h
@@ -31,7 +31,7 @@ public:
 protected:
   virtual void sendPointerEvent(const rfb::Point& pos, int buttonMask)=0;
 
-  virtual bool handleTimeout(rfb::Timer *t);
+  virtual void handleTimeout(rfb::Timer *t);
 
 private:
   void sendAction(const rfb::Point& pos, int buttonMask, int action);
diff --git a/vncviewer/GestureHandler.cxx b/vncviewer/GestureHandler.cxx
index c3cc1531..ed99555e 100644
--- a/vncviewer/GestureHandler.cxx
+++ b/vncviewer/GestureHandler.cxx
@@ -323,14 +323,12 @@ bool GestureHandler::hasDetectedGesture()
   return true;
 }
 
-bool GestureHandler::handleTimeout(rfb::Timer* t)
+void GestureHandler::handleTimeout(rfb::Timer* t)
 {
   if (t == &longpressTimer)
     longpressTimeout();
   else if (t == &twoTouchTimer)
     twoTouchTimeout();
-
-  return false;
 }
 
 void GestureHandler::longpressTimeout()
diff --git a/vncviewer/GestureHandler.h b/vncviewer/GestureHandler.h
index 372b7865..b07454df 100644
--- a/vncviewer/GestureHandler.h
+++ b/vncviewer/GestureHandler.h
@@ -42,7 +42,7 @@ class GestureHandler : public rfb::Timer::Callback {
   private:
     bool hasDetectedGesture();
 
-    virtual bool handleTimeout(rfb::Timer* t);
+    virtual void handleTimeout(rfb::Timer* t);
     void longpressTimeout();
     void twoTouchTimeout();
 
diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index 91e2be3b..366327fa 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -188,7 +188,7 @@ static void mainloop(const char* vncserver, network::Socket* sock)
       int next_timer;
 
       next_timer = Timer::checkTimeouts();
-      if (next_timer == 0)
+      if (next_timer < 0)
         next_timer = INT_MAX;
 
       if (Fl::wait((double)next_timer / 1000.0) < 0.0) {