[Pkg-owncloud-commits] [owncloud-client] 164/219: DiscoveryPhase: fix the name of a function
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:22 UTC 2014
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 b4071cec0194a5e7ed699b376523cc4a0e57aa9d
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Fri Sep 26 12:34:30 2014 +0200
DiscoveryPhase: fix the name of a function
It was renamed from white list to black list long ago
---
src/mirall/discoveryphase.cpp | 4 ++--
src/mirall/discoveryphase.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mirall/discoveryphase.cpp b/src/mirall/discoveryphase.cpp
index f81dc0a..edc2295 100644
--- a/src/mirall/discoveryphase.cpp
+++ b/src/mirall/discoveryphase.cpp
@@ -45,7 +45,7 @@ bool DiscoveryJob::isInBlackList(const QString& path) const
return false;
}
-int DiscoveryJob::isInWhiteListCallBack(void *data, const char *path)
+int DiscoveryJob::isInBlackListCallBack(void *data, const char *path)
{
return static_cast<DiscoveryJob*>(data)->isInBlackList(QString::fromUtf8(path));
}
@@ -72,7 +72,7 @@ void DiscoveryJob::update_job_update_callback (bool local,
void DiscoveryJob::start() {
_selectiveSyncBlackList.sort();
- _csync_ctx->checkBlackListHook = isInWhiteListCallBack;
+ _csync_ctx->checkBlackListHook = isInBlackListCallBack;
_csync_ctx->checkBlackListData = this;
_csync_ctx->callbacks.update_callback = update_job_update_callback;
diff --git a/src/mirall/discoveryphase.h b/src/mirall/discoveryphase.h
index 7788f6d..5625d7f 100644
--- a/src/mirall/discoveryphase.h
+++ b/src/mirall/discoveryphase.h
@@ -41,7 +41,7 @@ class DiscoveryJob : public QObject {
* false if the path should be ignored
*/
bool isInBlackList(const QString &path) const;
- static int isInWhiteListCallBack(void *, const char *);
+ static int isInBlackListCallBack(void *, const char *);
static void update_job_update_callback (bool local,
const char *dirname,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list