[Pkg-owncloud-commits] [owncloud-client] 217/332: SocketAPI: Fix separators on Windows
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Aug 14 21:07:01 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 35b6d096159aaa9e9716656c9cb9b1214a601a82
Author: Daniel Molkentin <danimo at owncloud.com>
Date: Thu Jul 17 17:41:20 2014 +0200
SocketAPI: Fix separators on Windows
---
src/mirall/socketapi.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/mirall/socketapi.cpp b/src/mirall/socketapi.cpp
index 6895258..60e5567 100644
--- a/src/mirall/socketapi.cpp
+++ b/src/mirall/socketapi.cpp
@@ -239,7 +239,7 @@ void SocketApi::slotUpdateFolderView(const QString& alias)
Folder *f = FolderMan::instance()->folder(alias);
if (f) {
msg.append(QLatin1String(":"));
- msg.append(QDir::cleanPath(f->path()));
+ msg.append(QDir::toNativeSeparators(QDir::cleanPath(f->path())));
}
broadcastMessage(msg);
@@ -258,7 +258,8 @@ void SocketApi::slotJobCompleted(const QString &folder, const SyncFileItem &item
command = QLatin1String("ERROR");
}
- broadcastMessage(QLatin1String("BROADCAST:") + command + QLatin1Char(':') + path);
+ broadcastMessage(QLatin1String("BROADCAST:") + command + QLatin1Char(':')
+ + QDir::toNativeSeparators(path));
}
@@ -309,7 +310,8 @@ void SocketApi::command_RETRIEVE_FILE_STATUS(const QString& argument, QTcpSocket
statusString = fileStatus.toSocketAPIString();
}
- QString message = QLatin1String("STATUS:")+statusString+QLatin1Char(':')+argument;
+ QString message = QLatin1String("STATUS:")+statusString+QLatin1Char(':')
+ +QDir::toNativeSeparators(argument);
sendMessage(socket, message);
}
--
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