[Pkg-owncloud-commits] [owncloud-client] 04/27: FolderStatusModel: Fix typo in error message #3524

[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 2c011dcae645c5444f2183cabe860114fb1fc168
Author: Christian Kamm <mail at ckamm.de>
Date:   Wed Aug 19 15:04:39 2015 +0200

    FolderStatusModel: Fix typo in error message #3524
---
 src/gui/folderstatusmodel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/folderstatusmodel.cpp b/src/gui/folderstatusmodel.cpp
index 8724a88..383d09f 100644
--- a/src/gui/folderstatusmodel.cpp
+++ b/src/gui/folderstatusmodel.cpp
@@ -149,7 +149,7 @@ QVariant FolderStatusModel::data(const QModelIndex &index, int role) const
         return QVariant();
     case ErrorLabel:
         switch(role) {
-            case Qt::DisplayRole: return tr("Error while loading the list of folder from the server.");
+            case Qt::DisplayRole: return tr("Error while loading the list of folders from the server.");
             default: return QVariant();
         }
     case RootFolder:
@@ -427,7 +427,7 @@ void FolderStatusModel::fetchMore(const QModelIndex& parent)
     }
     LsColJob *job = new LsColJob(_accountState->account(), path, this);
     job->setProperties(QList<QByteArray>() << "resourcetype" << "quota-used-bytes");
-    job->setTimeout(5 * 1000);
+    job->setTimeout(1);
     connect(job, SIGNAL(directoryListingSubfolders(QStringList)),
             SLOT(slotUpdateDirectories(QStringList)));
     connect(job, SIGNAL(finishedWithError(QNetworkReply*)),

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