--- a/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp	Thu Jul 15 18:38:16 2010 +0300
+++ b/phoneapp/phoneuistates/src/cphonetwosinglesandwaiting.cpp	Thu Aug 19 09:54:27 2010 +0300
@@ -217,27 +217,21 @@
     {
     __LOGMETHODSTARTEND( EPhoneUIStates, 
         "CPhoneTwoSinglesAndWaiting::HandleIdleL()");
-     
-    BeginUiUpdateLC();    
-         
+    BeginUiUpdateLC();
     if ( !IsNumberEntryUsedL() )
         {
-        // Close menu bar, if number entry isnt open.
-        iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose );       
+        iViewCommandHandle->ExecuteCommandL( EPhoneViewMenuBarClose ); 
         }
-    
-    // Remove call 
     iViewCommandHandle->ExecuteCommandL( EPhoneViewRemoveCallHeader, aCallId );
     
     if ( iRingingCallId == aCallId )
         {
-        StateTransitionToTwoSinglesL();    
+        StateTransitionToTwoSinglesL();
         }
     else
         {
         StateTransitionToSingleAndWaitingL();
         }
-
     EndUiUpdate();
     }
 
@@ -349,12 +343,7 @@
     iViewCommandHandle->ExecuteCommandL( EPhoneViewCreateConference, aCallId,
         &callHeaderParam );
         
-    // Clear the flag
-    TPhoneCmdParamBoolean booleanParam;
-    booleanParam.SetBoolean( EFalse );
-    iViewCommandHandle->ExecuteCommandL( 
-         EPhoneViewSetNeedToReturnToForegroundAppStatus,
-         &booleanParam );
+    SetNeedToReturnToForegroundAppStatusL( EFalse );
         
     EndUiUpdate();
     // Go to Conference And Waiting state