[Libreoffice-commits] online.git: Branch 'libreoffice-5-3' - common/Protocol.hpp

Tor Lillqvist tml at collabora.com
Thu Mar 23 09:23:29 UTC 2017


 common/Protocol.hpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit afcdf08fcede9e51743b7df229e9688fcb8a1243
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Dec 14 17:23:42 2016 +0200

    Add 'userinactive' to messages that don't indicate user interaction
    
    In fact, it is more or less the opposite;)
    
    Change-Id: I34eca0ed6b7d4ce369ae803eac542f0996d193eb
    Reviewed-on: https://gerrit.libreoffice.org/35560
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/common/Protocol.hpp b/common/Protocol.hpp
index e95090d4..e7f2692a 100644
--- a/common/Protocol.hpp
+++ b/common/Protocol.hpp
@@ -143,7 +143,8 @@ namespace LOOLProtocol
 
         return (token.find("tile") == std::string::npos &&
                 token.find("status") == std::string::npos &&
-                token.find("state") == std::string::npos);
+                token.find("state") == std::string::npos &&
+                token != "userinactive");
     }
 
     /// Returns the first line of a message.


More information about the Libreoffice-commits mailing list