[Pkg-owncloud-commits] [owncloud-client] 269/470: ProtocolWidget: handle Conflicts as not-synced items

[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 7994b3d91ac52ad000714e18ff5bfe1b8c7352a9
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Apr 5 11:13:12 2016 +0200

    ProtocolWidget: handle Conflicts as not-synced items
---
 src/libsync/progressdispatcher.cpp | 2 +-
 src/libsync/syncfileitem.h         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libsync/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp
index 8f03228..c8dcbf5 100644
--- a/src/libsync/progressdispatcher.cpp
+++ b/src/libsync/progressdispatcher.cpp
@@ -34,7 +34,7 @@ QString Progress::asResultString( const SyncFileItem& item)
             return QCoreApplication::translate( "progress", "Uploaded");
         }
     case CSYNC_INSTRUCTION_CONFLICT:
-        return QCoreApplication::translate( "progress", "Downloaded, renamed conflicting file");
+        return QCoreApplication::translate( "progress", "Server version downloaded, renamed conflicting local file");
     case CSYNC_INSTRUCTION_REMOVE:
         return QCoreApplication::translate( "progress", "Deleted");
     case CSYNC_INSTRUCTION_EVAL_RENAME:
diff --git a/src/libsync/syncfileitem.h b/src/libsync/syncfileitem.h
index 26c9ed4..ed825a7 100644
--- a/src/libsync/syncfileitem.h
+++ b/src/libsync/syncfileitem.h
@@ -129,6 +129,7 @@ public:
         return _status == SyncFileItem::SoftError
                 || _status == SyncFileItem::NormalError
                 || _status == SyncFileItem::FatalError
+                || _status == SyncFileItem::Conflict
                 || !_errorString.isEmpty();
     }
 

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