diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-11-30 18:49:04 +0100 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2015-11-30 18:49:04 +0100 |
commit | 412563b7ff18684f9786f4e40b1a4d538f2d5233 (patch) | |
tree | 3190a317306cfb71b0d5d9bc4c0f06b260a92ce6 /common/resourceaccess.cpp | |
parent | 790991aa1007d3271d80bc7e77f5b4f86c9bcef0 (diff) | |
parent | 6ad307dd846d07f1b55a1679a8d2eb47525af57d (diff) | |
download | sink-412563b7ff18684f9786f4e40b1a4d538f2d5233.tar.gz sink-412563b7ff18684f9786f4e40b1a4d538f2d5233.zip |
Merge branch 'feature/modelresult' into develop
Diffstat (limited to 'common/resourceaccess.cpp')
-rw-r--r-- | common/resourceaccess.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp index bd9e2c9..be25533 100644 --- a/common/resourceaccess.cpp +++ b/common/resourceaccess.cpp | |||
@@ -282,6 +282,7 @@ KAsync::Job<void> ResourceAccess::sendCommand(int commandId, flatbuffers::FlatB | |||
282 | 282 | ||
283 | KAsync::Job<void> ResourceAccess::synchronizeResource(bool sourceSync, bool localSync) | 283 | KAsync::Job<void> ResourceAccess::synchronizeResource(bool sourceSync, bool localSync) |
284 | { | 284 | { |
285 | Trace() << "Sending synchronize command: " << sourceSync << localSync; | ||
285 | flatbuffers::FlatBufferBuilder fbb; | 286 | flatbuffers::FlatBufferBuilder fbb; |
286 | auto command = Akonadi2::CreateSynchronize(fbb, sourceSync, localSync); | 287 | auto command = Akonadi2::CreateSynchronize(fbb, sourceSync, localSync); |
287 | Akonadi2::FinishSynchronizeBuffer(fbb, command); | 288 | Akonadi2::FinishSynchronizeBuffer(fbb, command); |
@@ -340,7 +341,7 @@ KAsync::Job<void> ResourceAccess::sendRevisionReplayedCommand(qint64 revision) | |||
340 | void ResourceAccess::open() | 341 | void ResourceAccess::open() |
341 | { | 342 | { |
342 | if (d->socket && d->socket->isValid()) { | 343 | if (d->socket && d->socket->isValid()) { |
343 | log("Socket valid, so not opening again"); | 344 | // Trace() << "Socket valid, so not opening again"; |
344 | return; | 345 | return; |
345 | } | 346 | } |
346 | if (d->openingSocket) { | 347 | if (d->openingSocket) { |