[Pkg-owncloud-commits] [owncloud-client] 75/89: Show error reason for blacklisted files in sync activity.

[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 ec77ecfd0f89d21f88519f660baf94a5fc8f603c
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Thu Dec 12 12:21:24 2013 +0100

    Show error reason for blacklisted files in sync activity.
---
 src/mirall/csyncthread.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp
index 688b97d..01eefa6 100644
--- a/src/mirall/csyncthread.cpp
+++ b/src/mirall/csyncthread.cpp
@@ -235,7 +235,9 @@ bool CSyncThread::checkBlacklisting( SyncFileItem *item )
         if( re ) {
             qDebug() << "Item is on blacklist: " << entry._file << "retries:" << entry._retryCount;
             item->_instruction = CSYNC_INSTRUCTION_IGNORE;
-            item->_errorString = tr("The item is not synced because of previous errors.");
+            // FIXME: put the error string into an .arg(..) later
+            item->_errorString = tr("The item is not synced because of previous errors:")
+                    + QLatin1String(" ")+ entry._errorString;
             slotProgress( Progress::SoftError, *item );
         }
     }

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