From 75698ca17add2101fcbeac0e694044307474f924 Mon Sep 17 00:00:00 2001
From: Mateusz Piekos <mateuszpiekos@gmail.com>
Date: Mon, 6 Aug 2012 08:25:09 +0200
Subject: Blocked onOperationReceived signal on no-ops


diff --git a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
index fcb8ef1..2f7d544 100644
--- a/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
+++ b/Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp
@@ -154,9 +154,7 @@ namespace Swift {
 
 		WhiteboardDeleteOperation::ref deleteOp = boost::dynamic_pointer_cast<WhiteboardDeleteOperation>(operation);
 		if (deleteOp) {
-			if (deleteOp->getPos() != -1) {
-				graphicsView->deleteItem(P2QSTRING(deleteOp->getElementID()));
-			}
+			graphicsView->deleteItem(P2QSTRING(deleteOp->getElementID()));
 		}
 	}
 
diff --git a/Swiften/Whiteboard/IncomingWhiteboardSession.cpp b/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
index d3580e1..de7bd34 100644
--- a/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
+++ b/Swiften/Whiteboard/IncomingWhiteboardSession.cpp
@@ -31,7 +31,9 @@ namespace Swift {
 	void IncomingWhiteboardSession::handleIncomingOperation(WhiteboardOperation::ref operation) {
 		WhiteboardClient::Result pairResult = client.handleServerOperationReceived(operation);
 		if (pairResult.client) {
-			onOperationReceived(pairResult.client);
+			if (pairResult.client->getPos() != -1) {
+				onOperationReceived(pairResult.client);
+			}
 			lastOpID = pairResult.client->getID();
 		}
 
diff --git a/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp b/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
index 63e4476..7debbe0 100644
--- a/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
+++ b/Swiften/Whiteboard/OutgoingWhiteboardSession.cpp
@@ -40,8 +40,9 @@ namespace Swift {
 
 	void OutgoingWhiteboardSession::handleIncomingOperation(WhiteboardOperation::ref operation) {
 		WhiteboardOperation::ref op = server.handleClientOperationReceived(operation);
-
-		onOperationReceived(op);
+		if (op->getPos() != -1) {
+			onOperationReceived(op);
+		}
 		lastOpID = op->getID();
 
 		WhiteboardPayload::ref payload = boost::make_shared<WhiteboardPayload>();
-- 
cgit v0.10.2-6-g49f6