Handle SoftError and show blacklisted files.

1 files changed, 8 insertions, 3 deletions

diff --git a/src/mirall/protocolwidget.cpp b/src/mirall/protocolwidget.cpp
index bd9155136..f88e5d7ba 100644
--- a/src/mirall/protocolwidget.cpp
+++ b/src/mirall/protocolwidget.cpp
@@ -111,7 +111,8 @@ void ProtocolWidget::setSyncResult( const SyncResult& result )
          // handle ignored files here.
 
          if( item._status == SyncFileItem::FileIgnored
-             || item._status == SyncFileItem::Conflict ) {
+             || item._status == SyncFileItem::Conflict
+             || item._status == SyncFileItem::SoftError ) {
              QStringList columns;
              QString timeStr = timeString(dt);
              QString longTimeStr = timeString(dt, QLocale::LongFormat);
@@ -120,7 +121,10 @@ void ProtocolWidget::setSyncResult( const SyncResult& result )
              columns << item._file;
              columns << folder;
              if( item._status == SyncFileItem::FileIgnored ) {
-                 if( item._type == SyncFileItem::SoftLink ) {
+                 if( item._blacklistedInDb ) {
+                     errMsg = tr("Blacklisted");
+                     tooltip = tr("The file is blacklisted because of previous error conditions.");
+                 }else if( item._type == SyncFileItem::SoftLink ) {
                      errMsg = tr("Soft Link ignored");
                      tooltip = tr("Softlinks break the semantics of synchronization.\nPlease do not "
                                   "use them in synced directories");
@@ -149,6 +153,8 @@ void ProtocolWidget::setSyncResult( const SyncResult& result )
                               "created a so called conflict. The local change is copied to the conflict\n"
                               "file while the file from the server side is available under the original\n"
                               "name");
+             } else if( item._status == SyncFileItem::SoftError ) {
+                 errMsg = item._errorString;
              } else {
                  Q_ASSERT(!"unhandled instruction.");
              }
@@ -181,7 +187,6 @@ void ProtocolWidget::setupList()
           haveSyncResult = true;
       }
 
-
       if( haveSyncResult ) {
           setSyncResult(lastResult);
       }