voipplugins/accountcreationplugin/engine/src/acphttphandler.cpp
branchRCL_3
changeset 23 755430a7d64b
parent 22 d38647835c2e
--- a/voipplugins/accountcreationplugin/engine/src/acphttphandler.cpp	Wed Sep 01 12:29:57 2010 +0100
+++ b/voipplugins/accountcreationplugin/engine/src/acphttphandler.cpp	Tue Sep 14 21:02:05 2010 +0300
@@ -40,7 +40,7 @@
 // ---------------------------------------------------------------------------
 //
 CAcpHttpHandler::CAcpHttpHandler( MAcpHttpHandlerObserver& aObserver )
-    : CActive( CActive::EPriorityStandard ), iObserver( aObserver )
+    : CActive( CActive::EPriorityStandard ), iObserver( aObserver ), iCancelRequest( EFalse )
     {
     CActiveScheduler::Add( this );
     }
@@ -311,6 +311,7 @@
     if ( !iTransactionRunning )
         {
         ACPLOG( "CAcpHttpHandler::CancelTransaction end (not running)" );
+        iCancelRequest = ETrue;
         return;
         }
     
@@ -559,9 +560,18 @@
             iConnectionOpen = ETrue;
             }
         
-        // Submit the first transaction. Further transactions are submitted
-        // in GetDataL.
-        SubmitTransactionL();
+        // If the cancel button is pressed by the end user during the period of connection-opening,
+        // transaction need not to be submitted. Otherwise, need to be submitted.
+        if ( iCancelRequest )
+            {
+            iCancelRequest = EFalse;     
+            }
+        else
+            {
+            // Submit the first transaction. Further transactions are submitted
+            // in GetDataL.
+            SubmitTransactionL();
+            }
         }
     else
         {