summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Piekos <mateuszpiekos@gmail.com>2012-08-06 06:17:00 (GMT)
committerMateusz Piekos <mateuszpiekos@gmail.com>2012-08-06 06:17:00 (GMT)
commit7709b172620653a15f7358186914d1a2b8a5e9be (patch)
tree6d6be9df9027d6d69377c000cdba4d6938562a0b /Swiften/Whiteboard/IncomingWhiteboardSession.cpp
parent6f300f03ed9a61b56dc69dab327869dd7ba4ff10 (diff)
downloadswift-contrib-7709b172620653a15f7358186914d1a2b8a5e9be.zip
swift-contrib-7709b172620653a15f7358186914d1a2b8a5e9be.tar.bz2
Moved handling of operation IDs to session classes
Diffstat (limited to 'Swiften/Whiteboard/IncomingWhiteboardSession.cpp')
-rw-r--r--Swiften/Whiteboard/IncomingWhiteboardSession.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Swiften/Whiteboard/IncomingWhiteboardSession.cpp b/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
index 1904457..d3580e1 100644
--- a/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
+++ b/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
@@ -32,6 +32,7 @@ namespace Swift {
WhiteboardClient::Result pairResult = client.handleServerOperationReceived(operation);
if (pairResult.client) {
onOperationReceived(pairResult.client);
+ lastOpID = pairResult.client->getID();
}
if (pairResult.server) {
@@ -42,6 +43,10 @@ namespace Swift {
}
void IncomingWhiteboardSession::sendOperation(WhiteboardOperation::ref operation) {
+ operation->setID(getClientID()+idGenerator.generateID());
+ operation->setParentID(lastOpID);
+ lastOpID = operation->getID();
+
WhiteboardOperation::ref result = client.handleLocalOperationReceived(operation);
if (result) {