[Pkg-owncloud-commits] [owncloud-client] 110/211: Revert "socketapi: if the filename is empty, it's actually /"
Sandro Knauß
hefee-guest at moszumanska.debian.org
Sat Oct 25 09:10:34 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 e5ef5f2410d31ed9147ce7db5a8fd1833d09c0c2
Author: Markus Goetz <markus at woboq.com>
Date: Fri Oct 17 13:25:15 2014 +0200
Revert "socketapi: if the filename is empty, it's actually /"
Not needed, the socketapi checks for "".
This reverts commit 561e3c780d48ac31ccb4fc26090211bc7e15b16b.
---
src/mirall/socketapi.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index 598665c..26abe78 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -353,11 +353,10 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, SocketType
DEBUG << "folder offline or not watched:" << argument;
statusString = QLatin1String("NOP");
} else {
- QString file = argument.mid(syncFolder->path().length());
- if( file.isEmpty() ) file = QLatin1String("/");
- SyncFileStatus fStatus = this->fileStatus(syncFolder, file, _excludes);
+ const QString file = argument.mid(syncFolder->path().length());
+ SyncFileStatus fileStatus = this->fileStatus(syncFolder, file, _excludes);
- statusString = fStatus.toSocketAPIString();
+ statusString = fileStatus.toSocketAPIString();
}
QString message = QLatin1String("STATUS:")+statusString+QLatin1Char(':')
--
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