[Pkg-owncloud-commits] [owncloud-client] 83/103: Csync: Set error at correct place

[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 4489a56c659fb8d8154909026a37ac8a08a78598
Author: Markus Goetz <markus at woboq.com>
Date:   Mon Apr 28 17:25:18 2014 +0200

    Csync: Set error at correct place
---
 src/mirall/syncengine.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp
index 95338e7..f8e3a4e 100644
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -177,9 +177,6 @@ QString SyncEngine::csyncErrorToString(CSYNC_STATUS err)
     case CSYNC_STATUS_ABORTED:
         errStr = tr("Aborted by the user");
         break;
-    case CYSNC_STATUS_FILE_LOCKED_OR_OPEN:
-        errStr = "File locked"; // don't translate, internal use!
-        break;
 
     default:
         errStr = tr("An internal error number %1 happened.").arg( (int) err );
@@ -282,6 +279,9 @@ int SyncEngine::treewalkFile( TREE_WALK_FILE *file, bool remote )
     case CSYNC_STATUS_INDIVIDUAL_IS_INVALID_CHARS:
         item._errorString = tr("File contains invalid characters that can not be synced cross platform.");
         break;
+    case CYSNC_STATUS_FILE_LOCKED_OR_OPEN:
+        item._errorString = QLatin1String("File locked"); // don't translate, internal use!
+        break;
 
     default:
         Q_ASSERT("Non handled error-status");

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