[Pkg-owncloud-commits] [owncloud-client] 39/211: propagator: Do not show an error message saying it was done by user interaction if it was not

[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 d880f2ffbc0ff1ef51c121f531548152f84edc4f
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Oct 10 14:52:37 2014 +0200

    propagator: Do not show an error message saying it was done by user interaction if it was not
    
    There is many reasons why we could abort (for example timeouts)
    And in this case we should not show to the user it was aborted
    by user interaction
---
 src/mirall/owncloudpropagator.cpp | 5 ++---
 src/mirall/socketapi.cpp          | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index b81badb..79dad98 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -56,11 +56,10 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
         }
     }
 
-    if( _propagator->_abortRequested.fetchAndAddRelaxed(0) ) {
+    if( _propagator->_abortRequested.fetchAndAddRelaxed(0) &&
+            (status == SyncFileItem::NormalError || status == SyncFileItem::FatalError)) {
         // an abort request is ongoing. Change the status to Soft-Error
-
         status = SyncFileItem::SoftError;
-        _item._errorString = tr("Operation was canceled by user interaction.");
     }
 
     _item._status = status;
diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index 1784f1f..62ff255 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -226,6 +226,9 @@ SocketApi::SocketApi(QObject* parent)
     , _excludes(0)
 {
 
+    qDebug() << "Hello";
+    qWarning() << "gello";
+
 #ifdef SOCKETAPI_TCP
     // setup socket
     DEBUG << "Establishing SocketAPI server at" << PORT;

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