[Pkg-owncloud-commits] [owncloud-client] 124/498: confirm feature: fix typos spotted by ckamm

[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 02ffbf8989d8b7594f94c94a3c969ea0432fae5f
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Wed Jun 3 15:20:42 2015 +0200

    confirm feature: fix typos spotted by ckamm
---
 src/cmd/cmd.cpp                | 3 ++-
 src/libsync/discoveryphase.cpp | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index 0f83bdb..0094d67 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -443,8 +443,9 @@ restart_sync:
 
     Cmd cmd;
     SyncJournalDb db(options.source_dir);
-    if (!selectiveSyncList.empty())
+    if (!selectiveSyncList.empty()) {
         selectiveSyncFixup(&db, selectiveSyncList);
+    }
 
     SyncEngine engine(account, _csync_ctx, options.source_dir, QUrl(options.target_url).path(), folder, &db);
     QObject::connect(&engine, SIGNAL(finished()), &app, SLOT(quit()));
diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index 36c1303..6258074 100644
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -23,7 +23,7 @@
 namespace OCC {
 
 
-/* Given a sorted list of paths ending with '/', return weather or not the given path is within one of the paths of the list*/
+/* Given a sorted list of paths ending with '/', return whether or not the given path is within one of the paths of the list*/
 static bool findPathInList(const QStringList &list, const QString &path)
 {
     Q_ASSERT(std::is_sorted(list.begin(), list.end()));
@@ -84,12 +84,13 @@ bool DiscoveryJob::checkSelectiveSyncNewShare(const QString& path)
     }
 
     auto limit = _newSharedFolderSizeLimit;
-    if (true || result > limit) {
+    if (result > limit) {
         // we tell the UI there is a new folder
         emit newSharedFolder(path);
         return true;
     } else {
-        // it is not too big, but it in the white list and do not block
+        // it is not too big, put it in the white list (so we will not do more query for the children)
+        // and and do not block.
         auto p = path;
         if (!p.endsWith(QLatin1Char('/'))) { p += QLatin1Char('/'); }
         _selectiveSyncWhiteList.insert(std::upper_bound(_selectiveSyncWhiteList.begin(),

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