Fix issue with cancel not cancelling synchronize service action.

UI updates OK, but servicehandler is given an incorrect action id,
so protocol plugins are never really told to cancel the operation.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/libraries/qmfclient/qmailserviceaction.cpp b/src/libraries/qmfclient/qmailserviceaction.cpp
index 7bcf84fb..36205ac9 100644
--- a/src/libraries/qmfclient/qmailserviceaction.cpp
+++ b/src/libraries/qmfclient/qmailserviceaction.cpp
@@ -110,7 +110,11 @@ void QMailServiceActionPrivate::cancelOperation()
 {
     Q_ASSERT(_action != 0 && _isValid);
     if (_isValid) {
-        clearSubActions();
+        if (_pendingActions.count()) {
+            _pendingActions.first().action->cancelOperation();
+            clearSubActions();
+            return;
+	}
         _server->cancelTransfer(_action);
     }
 }