[Pkg-owncloud-commits] [owncloud-client] 71/171: Don't show parent folders in the error list #3796

[Sandro Knauß]

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

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit 2f355c473acec71e77c0499bd55c26a634471263
Author: Jocelyn Turcotte <jturcotte at woboq.com>
Date:   Wed Jan 6 12:35:36 2016 +0100

    Don't show parent folders in the error list #3796
    
    The error status of children should only be used for the etag logic.
    The SocketApi uses a path matching system to do this and the UI should
    report errors only for individual involved files/directories.
---
 src/libsync/owncloudpropagator.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 4d31c42..ab0734d 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -663,7 +663,10 @@ void PropagateDirectory::finalize()
         }
     }
     _state = Finished;
-    _item->_status = _hasError == SyncFileItem::NoStatus ? SyncFileItem::Success : _hasError;
+    // Just to make sure that the SocketApi will know by looking in
+    // SyncEngine::_syncedItems that this folder is done synchronizing.
+    _item->_status = SyncFileItem::Success;
+
     emit itemCompleted(*_item, *this);
     emit finished(_item->_status);
 }

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