[Pkg-owncloud-commits] [owncloud-client] 316/470: SocketAPI: Use NOP only, not NONE in the share api protocol.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 15988c6fda5498cb1b1871e802626a55fecde9a2
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Apr 12 18:27:32 2016 +0200

    SocketAPI: Use NOP only, not NONE in the share api protocol.
    
    Otherwise, plugins might brake, as the linux one did.
---
 src/libsync/syncfilestatus.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libsync/syncfilestatus.cpp b/src/libsync/syncfilestatus.cpp
index 2afd5c0..c2961f7 100644
--- a/src/libsync/syncfilestatus.cpp
+++ b/src/libsync/syncfilestatus.cpp
@@ -50,11 +50,13 @@ bool SyncFileStatus::sharedWithMe()
 QString SyncFileStatus::toSocketAPIString() const
 {
     QString statusString;
+    bool canBeShared = true;
 
     switch(_tag)
     {
     case StatusNone:
-        statusString = QLatin1String("NONE");
+        statusString = QLatin1String("NOP");
+        canBeShared = false;
         break;
     case StatusSync:
         statusString = QLatin1String("SYNC");
@@ -70,7 +72,7 @@ QString SyncFileStatus::toSocketAPIString() const
         statusString = QLatin1String("ERROR");
         break;
     }
-    if(_sharedWithMe) {
+    if(canBeShared && _sharedWithMe) {
         statusString += QLatin1String("+SWM");
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git