[Pkg-owncloud-commits] [owncloud-client] 14/26: Add a slot to wipe the folder's blacklist.

[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 e8ffb17b3bcead6484c1f2e157efbb9a29b87098
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Dec 3 14:02:44 2013 +0100

    Add a slot to wipe the folder's blacklist.
---
 src/mirall/folder.cpp | 5 +++++
 src/mirall/folder.h   | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index 5592096..7b64b1d 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -416,6 +416,11 @@ void Folder::createGuiLog( const QString& filename, const QString& verb, int cou
     }
 }
 
+int Folder::slotWipeBlacklist()
+{
+    return _journal.wipeBlacklist();
+}
+
 void Folder::slotLocalPathChanged( const QString& dir )
 {
     QDir notifiedDir(dir);
diff --git a/src/mirall/folder.h b/src/mirall/folder.h
index 6d30051..769a145 100644
--- a/src/mirall/folder.h
+++ b/src/mirall/folder.h
@@ -167,6 +167,8 @@ public slots:
       void setProxyDirty(bool value);
       bool proxyDirty();
 
+      int slotWipeBlacklist();
+
 private slots:
     void slotCSyncStarted();
     void slotCSyncError(const QString& );

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