diff -r c84cf270c54f -r 92ab7f8d0eab phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp
--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingle.cpp	Fri Mar 19 09:28:42 2010 +0200
@@ -62,8 +62,10 @@
         {
         TPhoneCmdParamBoolean dtmfSendFlag;
         dtmfSendFlag.SetBoolean( EFalse );
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, 
-    	    &dtmfSendFlag );     	
+// <-- QT PHONE START -->
+        iViewCommandHandle->ExecuteCommand( EPhoneViewSetDtmfOptionsFlag, 
+            &dtmfSendFlag );
+// <-- QT PHONE END -->         
         }
     }
 
@@ -127,13 +129,13 @@
             HandleHeldL( aCallId );
             break;
             
-        case MEngineMonitor::EPEMessageInValidEmergencyNumber:				
-	 		SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed );  	 					
+        case MEngineMonitor::EPEMessageInValidEmergencyNumber:              
+            SendGlobalErrorNoteL( EPhoneNoteTextNotAllowed );                       
             break;
             
         case MEngineMonitor::EPEMessageValidEmergencyNumber:
             DialVoiceCallL();
-            break;        	 				
+            break;                          
            
         case MEngineMonitor::EPEMessageAddedConferenceMember:
             HandleAddedConferenceMemberL( aCallId );
@@ -198,13 +200,13 @@
     TPhoneCmdParamBoolean conferenceAndSingleFlag;
     conferenceAndSingleFlag.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag, 
-    	&conferenceAndSingleFlag );
+        &conferenceAndSingleFlag );
     
     // Set specific flag to view so that DTMF menu item available
     TPhoneCmdParamBoolean dtmfSendFlag;
     dtmfSendFlag.SetBoolean( ETrue );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetDtmfOptionsFlag, 
-    	&dtmfSendFlag );    	
+        &dtmfSendFlag );        
     
     TPhoneViewResponseId response;
     TPhoneCmdParamCallStateData callStateData;
@@ -305,7 +307,9 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleConnectedConferenceL");
     // Update call state
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    callHeaderParam.SetCallState( EPEStateConnected );
+    // <-- QT PHONE START -->
+    callHeaderParam.SetCallState( EPEStateConnectedConference );
+    // <-- QT PHONE END -->
 
     TBuf<KPhoneCallHeaderLabelMaxLength> conferenceText( KNullDesC );
     TInt callLabelId = CPhoneMainResourceResolver::Instance()->
@@ -342,7 +346,9 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingle::HandleHeldConferenceL");
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    callHeaderParam.SetCallState( EPEStateHeld );
+    // <-- QT PHONE START -->
+    callHeaderParam.SetCallState( EPEStateHeldConference );
+    // <-- QT PHONE END -->
     
     TInt callLabelId;
     TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC );
@@ -382,7 +388,10 @@
     callHeaderParam.SetCallState( EPEStateConnected );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
         &callHeaderParam );
-    
+
+    // <-- QT PHONE START --> 
+    SetTouchPaneButtons( EPhoneConferenceButtons );
+    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -407,7 +416,11 @@
     callHeaderParam.SetLabelText( labelText );
 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble, aCallId, 
-        &callHeaderParam );        
+        &callHeaderParam );      
+    
+    // <-- QT PHONE START --> 
+    SetTouchPaneButtons( EPhoneConferenceButtons );
+    // <-- QT PHONE END -->
     }
 
 // -----------------------------------------------------------
@@ -433,7 +446,7 @@
     TPhoneCmdParamBoolean conferenceAndSingleFlag;
     conferenceAndSingleFlag.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag, 
-    	&conferenceAndSingleFlag );
+        &conferenceAndSingleFlag );
 
     UpdateCbaL( EPhoneCallHandlingInCallCBA );
     iStateMachine->ChangeState( EPhoneStateConference );        
@@ -457,7 +470,7 @@
 void CPhoneConferenceAndSingle::HandleIncomingL( TInt aCallId )
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
-    	"CPhoneConferenceAndSingle::HandleIncomingL");
+        "CPhoneConferenceAndSingle::HandleIncomingL");
     
     BeginUiUpdateLC();  
     
@@ -471,27 +484,28 @@
     TPhoneCmdParamBoolean booleanParam;
     booleanParam.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( 
-    	EPhoneViewOpenConferenceList, &booleanParam );
+        EPhoneViewOpenConferenceList, &booleanParam );
 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewCloseFSW );
     
-    // Set touch controls
-    SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
-
     // Check if HW Keys or Call UI should be disabled
     CheckDisableHWKeysAndCallUIL();
-
-    SetTouchPaneButtons( EPhoneWaitingCallButtons );
-        
+    
+    // <-- QT PHONE START -->
     // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam  );
 
+    // Set touch controls
+    SetTouchPaneButtonDisabled( EPhoneCallComingCmdAnswer );
+    SetTouchPaneButtons( EPhoneWaitingCallButtons );
+    // <-- QT PHONE END -->
+    
     EndUiUpdate();
 
     TPhoneCmdParamBoolean conferenceAndSingleFlag;
     conferenceAndSingleFlag.SetBoolean( EFalse );
     iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag, 
-    	&conferenceAndSingleFlag );
+        &conferenceAndSingleFlag );
     
     // Go to Conference And Single And Waiting state
     UpdateCbaL( EPhoneCallHandlingCallWaitingCBA );
@@ -505,7 +519,7 @@
 void CPhoneConferenceAndSingle::HandleIdleL( TInt aCallId )
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
-    	"CPhoneConferenceAndSingle::HandleIdleL");
+        "CPhoneConferenceAndSingle::HandleIdleL");
     
     // If dialler is not open then close menu bar.
     if ( !IsNumberEntryUsedL() )
@@ -531,24 +545,24 @@
         BeginUiUpdateLC(); 
         iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
 
-	    TPhoneCmdParamBoolean conferenceAndSingleFlag;
-	    conferenceAndSingleFlag.SetBoolean( EFalse );
-	    iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag, 
-	    	&conferenceAndSingleFlag );
+        TPhoneCmdParamBoolean conferenceAndSingleFlag;
+        conferenceAndSingleFlag.SetBoolean( EFalse );
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewSetConferenceAndSingleFlag, 
+            &conferenceAndSingleFlag );
+        
+        TPhoneCmdParamBoolean participantsVisibleFlag;
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewGetConferenceListVisibleFlag,
+                &participantsVisibleFlag );
         
-	    TPhoneCmdParamBoolean participantsVisibleFlag;
-	    iViewCommandHandle->ExecuteCommandL( EPhoneViewGetConferenceListVisibleFlag,
-	            &participantsVisibleFlag );
-	    
-	    // if participants list is visible - do not change buttons or cba
-	    if( !participantsVisibleFlag.Boolean() )
-	        {
-	        // Go to Conference state
-	        SetTouchPaneButtons( EPhoneConferenceButtons );
-	        SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );  
-	        
-	        UpdateCbaL( EPhoneCallHandlingInCallCBA );
-	        }
+        // if participants list is visible - do not change buttons or cba
+        if( !participantsVisibleFlag.Boolean() )
+            {
+            // Go to Conference state
+            SetTouchPaneButtons( EPhoneConferenceButtons );
+            SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );  
+            
+            UpdateCbaL( EPhoneCallHandlingInCallCBA );
+            }
       
 
         EndUiUpdate();
@@ -570,19 +584,19 @@
     
     TPhoneCmdParamInteger intParam;
     iViewCommandHandle->ExecuteCommandL( EPhoneViewGetCountOfActiveCalls,
-    	&intParam );
-    	
+        &intParam );
+        
     switch( intParam.Integer() )
-	    {
-	    case EOneActiveCall:
-	    	MakeStateTransitionToSingleL();
-	    	break;
-	    	
-	    case ETwoActiveCalls: // Fall through
-	    default:
-	    	MakeStateTransitionToTwoSinglesL();
-	    	break;
-	    }
+        {
+        case EOneActiveCall:
+            MakeStateTransitionToSingleL();
+            break;
+            
+        case ETwoActiveCalls: // Fall through
+        default:
+            MakeStateTransitionToTwoSinglesL();
+            break;
+        }
     }
 
 // --------------------------------------------------------------
@@ -600,15 +614,15 @@
         // send-key
         case EKeyYes:
             if( IsNumberEntryVisibleL() )
-				{
+                {
                 HandleSendL();
                 }
- 			else
-	 			{
+            else
+                {
                 // Number entry is below so swap the call
                 iStateMachine->SendPhoneEngineMessage(
-                	CPEPhoneModelIF::EPEMessageSwap );        
-	 			}
+                    CPEPhoneModelIF::EPEMessageSwap );        
+                }
             break;
             
         default:
@@ -649,7 +663,7 @@
         {
         iStateMachine->SendPhoneEngineMessage( 
             MPEPhoneModel::EPEMessageCheckEmergencyNumber );
-        } 	
+        }   
     CleanupStack::PopAndDestroy( phoneNumber );
     }