--- a/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp	Fri Sep 17 17:09:12 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphoneconferenceandsingleandwaiting.cpp	Mon Oct 04 16:06:10 2010 +0300
@@ -174,11 +174,11 @@
 // CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL
 // -----------------------------------------------------------
 //
-void CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL( TInt aCallId )
+void CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL( TInt /*aCallId*/ )
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConferenceAndSingleAndWaiting::HandleAddedConferenceMemberL");
     iViewCommandHandle->ExecuteCommandL( EPhoneViewAddToConference );
-    UpdateConferenceSecurityStatusL( aCallId );
+    UpdateConferenceSecurityStatusL();
     MakeStateTransitionToConferenceAndWaitingL( KConferenceCallId );
     }
 
@@ -272,11 +272,8 @@
                 &callStateData );
             if ( callStateData.CallId() != KErrNotFound )
                 {
-                iViewCommandHandle->ExecuteCommandL( EPhoneViewUpdateBubble,
-                    callStateData.CallId() );
-                
+                UpdateCallHeaderAndUiCommandsL( callStateData.CallId() );
                 SetRingingTonePlaybackL( callStateData.CallId() );
-                UpdateUiCommands();
                 SetBackButtonActive(EFalse);
                 iStateMachine->ChangeState( EPhoneStateIncoming );
                 }