--- a/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandcallsetup.cpp	Fri Mar 19 09:28:42 2010 +0200
@@ -57,8 +57,10 @@
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
         dtmfSendFlag.SetBoolean( EFalse );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, 
-    	    &dtmfSendFlag );
+// <-- QT PHONE START -->
+        iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag, 
+            &dtmfSendFlag );
+// <-- QT PHONE END -->         
         }
     }
 
@@ -107,41 +109,25 @@
     switch ( aMessage )
         {
         case MEngineMonitor::EPEMessageConnecting:
-            {
             iAlerting = ETrue;
             HandleConnectingL( aCallId );
-            }
             break;
             
         case MEngineMonitor::EPEMessageConnected:
-            {
             HandleConnectedL( aCallId );
-            }
             break;
             
         case MEngineMonitor::EPEMessageIdle:
-            {
             HandleIdleL( aCallId );
-            }
             break;
             
         case MEngineMonitor::EPEMessageConferenceIdle:
-            {
             HandleConferenceIdleL();
-            }
             break;
             
-        case MEngineMonitor::EPEMessageColpNumberAvailable:
-            {
-            HandleColpNoteL( aCallId );            
-            }
-            break;         
-            
         default:
-            {
             CPhoneConference::HandlePhoneEngineMessageL( aMessage, 
                 aCallId );
-            }
             break;
         }
     }
@@ -216,7 +202,7 @@
     TPhoneCmdParamBoolean dtmfSendFlag;
     dtmfSendFlag.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, 
-    	&dtmfSendFlag );
+        &dtmfSendFlag );
      
     if ( iOnScreenDialer &&  IsDTMFEditorVisibleL() )
         {
@@ -231,15 +217,15 @@
         resourceId = EPhoneConfCallParticipantsDropMenubar;    
         }        
     else
-	    {
-	    resourceId = EPhoneAlertingAndConfHeldCallMenuBar;
-	    }
+        {
+        resourceId = EPhoneAlertingAndConfHeldCallMenuBar;
+        }
 
     TPhoneCmdParamInteger integerParam;
     integerParam.SetInteger( 
                 CPhoneMainResourceResolver::Instance()->
                 ResolveResourceID( resourceId ) );
-	    
+        
     iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarOpen, 
         &integerParam );
     }
@@ -327,7 +313,8 @@
     SetTouchPaneButtons( EPhoneConferenceAndSingleButtons );
     SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
     EndUiUpdate(); 
-    
+
+    HandleColpNoteL( aCallId );
     UpdateCbaL ( EPhoneCallHandlingNewCallSwapCBA );
    
     iStateMachine->ChangeState( EPhoneStateConferenceAndSingle );                     
@@ -359,8 +346,8 @@
     
     if( conferenceExistsForCallId.Boolean() )
         {
-		// Remove 'Conference on hold' global note
-	    iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
+        // Remove 'Conference on hold' global note
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveGlobalNote );
     
         // Remove conference member from conference bubble
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveFromConference, 
@@ -402,8 +389,8 @@
             {
             // Show the number entry if it exists
             SetNumberEntryVisibilityL(ETrue);
-	        }
-	        
+            }
+            
         SetTouchPaneButtons( EPhoneConferenceButtons );
         EndUiUpdate();
         EndTransEffect();