[Libreoffice-commits] online.git: 2 commits - kit/KitHelper.hpp net/Socket.cpp net/WebSocketHandler.hpp

[Libreoffice Gerrit user]

 kit/KitHelper.hpp        |    4 ++++
 net/Socket.cpp           |    3 +++
 net/WebSocketHandler.hpp |    4 ++--
 3 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 5f779e0295632965beee54ab439c1ee4ac71322c
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Sep 11 11:34:53 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Sep 11 11:39:56 2018 +0300

    Revert "Just define these static const int members in-class"
    
    Can't say I understand why, but this turned out to not be a good idea
    after all. And no, using constexpr did not work either, so I won't
    waste any more time on this triviality, but just revert.
    
    This reverts commit 195b88ac8dab2c682fb22cbc396a02a27fecb465.
    
    Change-Id: I49f737dc6a36fa4808841cb8e0335246ad8c6d03

diff --git a/net/Socket.cpp b/net/Socket.cpp
index 237674419..38bacdde8 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -256,6 +256,9 @@ void SocketDisposition::execute()
 
 #endif
 
+const int WebSocketHandler::InitialPingDelayMs = 25;
+const int WebSocketHandler::PingFrequencyMs = 18 * 1000;
+
 void WebSocketHandler::dumpState(std::ostream& os)
 {
     os << (_shuttingDown ? "shutd " : "alive ")
diff --git a/net/WebSocketHandler.hpp b/net/WebSocketHandler.hpp
index 7e6befa15..3e1faabb4 100644
--- a/net/WebSocketHandler.hpp
+++ b/net/WebSocketHandler.hpp
@@ -44,8 +44,8 @@ protected:
         static const unsigned char Mask = 0x80;
     };
 
-    static const int InitialPingDelayMs = 25;
-    static const int PingFrequencyMs = 18 * 1000;
+    static const int InitialPingDelayMs;
+    static const int PingFrequencyMs;
 
 public:
     /// Perform upgrade ourselves, or select a client web socket.
commit 3110bea2ead5fc1faf41a7b2de9f99fa81d2e87c
Author:     Tor Lillqvist <tml at iki.fi>
AuthorDate: Mon Sep 10 19:52:01 2018 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 10 19:55:29 2018 +0300

    Add two missing values to kitCallbackTypeToString()

diff --git a/kit/KitHelper.hpp b/kit/KitHelper.hpp
index 3021f2534..61c5c07fd 100644
--- a/kit/KitHelper.hpp
+++ b/kit/KitHelper.hpp
@@ -115,10 +115,14 @@ namespace LOKitHelper
             return "INVALIDATE_HEADER";
         case LOK_CALLBACK_CELL_ADDRESS:
             return "CELL_ADDRESS";
+        case LOK_CALLBACK_RULER_UPDATE:
+            return "RULER_UPDATE";
         case LOK_CALLBACK_WINDOW:
             return "WINDOW";
         case LOK_CALLBACK_VALIDITY_LIST_BUTTON:
             return "VALIDITY_LIST_BUTTON";
+        case LOK_CALLBACK_CLIPBOARD_CHANGED:
+            return "CLIPBOARD_CHANGED";
        }
 
         return std::to_string(type);