--- a/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp	Fri Feb 19 23:59:33 2010 +0200
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmtsy/cmmvoicelinetsy.cpp	Fri Mar 12 15:49:38 2010 +0200
@@ -386,14 +386,15 @@
                 {    
                 mmCall = reinterpret_cast<CMmVoiceCallTsy*>(
                     iMmPhone->CallList()->GetMmCallByIndex(i) );
-                if ( mmCall->ServiceRequested(
+                if ( ( ( mmCall->CallId() == 0 ) || ( mmCall->CallId() == -1 ))
+                    && ( mmCall->ServiceRequested(
                         CMmCallTsy::EMultimodeCallDial ) 
                     ||  mmCall->ServiceRequested(
                         CMmCallTsy::EMultimodeMobileCallDialEmergencyCall )
                     || ( mmCall->ServiceRequested(
                         CMmCallTsy::EMultimodeCallDialISV ) ) 
                     || ( mmCall->ServiceRequested(
-                        CMmCallTsy::EMultimodeCallDialNoFdnCheck ) ) )
+                        CMmCallTsy::EMultimodeCallDialNoFdnCheck ) ) ) )
                     {
                     mmCall->SetCallId( callId );
 TFLOGSTRING2("TSY: CMmVoiceLineTsy::CompleteNotifyDiallingStatus - mmCall SetCallId: %d", callId);                      
@@ -454,6 +455,10 @@
             }
         }
 
+	CMmCallList* callList = iMmPhone->CallList();
+	TInt numberOfObjectsInCallList = callList->GetNumberOfObjects();
+    CMmVoiceCallTsy* mmCall = NULL;
+		
     //is TSY still waiting both hold and connected status indications
     if ( EWaitingHoldAndResumeOk == iSwapStatus )
         {
@@ -477,9 +482,6 @@
               ( EWaitingHoldOk == iSwapStatus &&
         RMobileCall::EStatusHold == aCallStatus ) )
         {
-        CMmCallList* callList = iMmPhone->CallList();
-        TInt numberOfObjectsInCallList = callList->GetNumberOfObjects();
-        CMmVoiceCallTsy* mmCall = NULL;
         //find the call object from which the swap was requested.
         for ( TInt i = 0; i < numberOfObjectsInCallList; i++ )
             {
@@ -532,6 +534,22 @@
             ret = ETrue;
             }
         }
+
+    if ( numberOfObjectsInCallList==1 && !otherVoiceLine )
+    	{
+
+    	// Swapping a single call. 
+        mmCall = reinterpret_cast<CMmVoiceCallTsy*>(
+            callList->GetMmCallByIndex(0) );
+        if ( mmCall->ServiceRequested( 
+                CMmCallTsy::EMultimodeMobileCallSwap ) )
+            {
+            // Complete swap request when the correct object has been found
+            mmCall->CompleteSwap( KErrNone );
+            }    	
+    	ret = ETrue;
+    	}
+    
     return ret;
     }