--- a/phoneapp/phoneuistates/src/cphoneconference.cpp	Tue Feb 02 00:10:04 2010 +0200
+++ b/phoneapp/phoneuistates/src/cphoneconference.cpp	Fri Mar 19 09:28:42 2010 +0200
@@ -260,11 +260,13 @@
 //
 void CPhoneConference::UpdateInCallCbaL()
     {
-    if ( iViewCommandHandle->HandleCommandL( EPhoneViewIsConferenceInExpandedMode ) 
-        != EPhoneViewResponseSuccess )
-        {
-        UpdateCbaL( EPhoneCallHandlingInCallCBA );
-        }    
+// <-- QT PHONE START -->
+    //if ( iViewCommandHandle->HandleCommandL( EPhoneViewIsConferenceInExpandedMode ) 
+    //    != EPhoneViewResponseSuccess )
+    //    {
+    UpdateCbaL( EPhoneCallHandlingInCallCBA );
+    //    }
+// <-- QT PHONE END -->    
     }
 
 // -----------------------------------------------------------
@@ -495,7 +497,9 @@
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneConference::HandleHeldConferenceL()");
     TPhoneCmdParamCallHeaderData callHeaderParam;
-    callHeaderParam.SetCallState( EPEStateHeld );
+    // <-- QT PHONE START --> 
+    callHeaderParam.SetCallState( EPEStateHeldConference );
+    // <-- QT PHONE END -->
     
     TInt callLabelId;
     TBuf<KPhoneCallHeaderLabelMaxLength> labelText( KNullDesC );
@@ -520,7 +524,9 @@
         }
     
     SetTouchPaneButtonDisabled( EPhoneInCallCmdPrivate );
-    
+    // <-- QT PHONE START --> 
+    SetTouchPaneButtons( EPhoneConferenceButtons );
+    // <-- QT PHONE END -->
     UpdateInCallCbaL();
     }
 
@@ -575,8 +581,10 @@
         "CPhoneConference::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()->
             ResolveResourceID( EPhoneCLIConferenceCall );
@@ -601,6 +609,9 @@
         }
     
     SetTouchPaneButtonEnabled( EPhoneInCallCmdPrivate );
+    // <-- QT PHONE START --> 
+    SetTouchPaneButtons( EPhoneConferenceButtons );
+    // <-- QT PHONE END -->
     
     UpdateInCallCbaL();
     }
@@ -935,14 +946,16 @@
 
     // Close fast swap window if it's displayed
     CEikonEnv::Static()->DismissTaskList();
-
+    
     // Check if HW Keys or Call UI should be disabled
     CheckDisableHWKeysAndCallUIL();
     
-    SetTouchPaneButtons( EPhoneWaitingCallButtons );
-    
+// <-- QT PHONE START -->
     // Display incoming call
     DisplayIncomingCallL( aCallId, dialerParam );
+    
+    SetTouchPaneButtons( EPhoneWaitingCallButtons );
+// <-- QT PHONE END -->
 
     EndUiUpdate();