--- a/phoneapp/phoneuiview/src/cphonetoolbarcontroller.cpp	Wed Sep 15 12:12:21 2010 +0300
+++ b/phoneapp/phoneuiview/src/cphonetoolbarcontroller.cpp	Wed Oct 13 14:31:22 2010 +0300
@@ -42,7 +42,7 @@
 _LIT ( KPhoneMifFileName, "phoneui.mif" );
 _LIT( KToolbarButtonEmptyStr, "" );
 
-const TInt KNumberOfButtons = 6;
+const TInt KNumberOfButtons = 5;
 struct SPhoneToolbarButton
     {
     TInt iIconIndex;
@@ -71,11 +71,7 @@
 	        {  EMbmPhoneuiQgn_indi_tb_handset,
 	           EMbmPhoneuiQgn_indi_tb_handset_mask,
 	           EPhoneInCallCmdHandset
-	        },
-	        {  EMbmPhoneuiQgn_indi_tb_bthf,
-               EMbmPhoneuiQgn_indi_tb_bthf,
-               EPhoneInCallCmdBtHandsfree
-           }
+	        }
         }; 
 
 
@@ -207,27 +203,8 @@
     iToolbar->HideItem( EPhoneInCallCmdUnmute, !iMuteFlag, ETrue );   
 
     // Show 'Handset'/'Ihf' icon
-     if ( iWiredAccFlag )
-         {    
-         __PHONELOG( EBasic, EPhoneUIView, "CPhoneToolbarController::UpdateToolbar(), wired ");
-         iToolbar->HideItem( EPhoneInCallCmdHandset, ETrue, EFalse );
-         iToolbar->HideItem( EPhoneInCallCmdBtHandsfree, ETrue, EFalse );
-         iToolbar->HideItem( EPhoneInCallCmdActivateIhf, EFalse, ETrue );
-         }
-     else if ( iBTAccAvailableFlag && !iBTAccFlag )
-         {    
-         __PHONELOG( EBasic, EPhoneUIView, "CPhoneToolbarController::UpdateToolbar(), BT ");
-         iToolbar->HideItem( EPhoneInCallCmdActivateIhf, ETrue, EFalse );
-         iToolbar->HideItem( EPhoneInCallCmdHandset, ETrue, EFalse );
-         iToolbar->HideItem( EPhoneInCallCmdBtHandsfree, EFalse, ETrue );
-         }
-     else
-         {
-         __PHONELOG( EBasic, EPhoneUIView, "CPhoneToolbarController::UpdateToolbar(), else ");
-         iToolbar->HideItem( EPhoneInCallCmdHandset, !iIhfFlag, EFalse );
-         iToolbar->HideItem( EPhoneInCallCmdActivateIhf, iIhfFlag, EFalse );
-         iToolbar->HideItem( EPhoneInCallCmdBtHandsfree, ETrue, ETrue );
-         }
+    iToolbar->HideItem( EPhoneInCallCmdActivateIhf, iIhfFlag, EFalse );
+    iToolbar->HideItem( EPhoneInCallCmdHandset, !iIhfFlag, ETrue );
     }   
 
 // ---------------------------------------------------------------------------
@@ -287,10 +264,6 @@
             resourceId = R_PHONEUI_TOOLTIP_HANDSET;
             break;
             
-        case EPhoneInCallCmdBtHandsfree:
-            resourceId = R_PHONEUI_TOOLTIP_BT_HANDSFREE;
-            break;
-            
         default:
             aText = KNullDesC().Alloc();
             break;
@@ -324,9 +297,6 @@
         case EPhoneInCallCmdHandset:
             skinId = KAknsIIDQgnIndiButtonHandset;
             break;
-        case EPhoneInCallCmdBtHandsfree:
-            skinId = KAknsIIDQgnIndiButtonBluetooth;
-            break;
         default:
             skinId = KAknsIIDNone;
             break;
@@ -439,38 +409,6 @@
             }
         }
     }
-// ---------------------------------------------------------
-// CPhoneToolbarController::SetBTAccFlag
-// ---------------------------------------------------------
-//
-void CPhoneToolbarController::SetBTAccFlag( TPhoneCommandParam* aCommandParam )
-    {
-    if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdBoolean )
-        {
-        TPhoneCmdParamBoolean* booleanParam = 
-            static_cast<TPhoneCmdParamBoolean*>( aCommandParam );
-        iBTAccFlag = booleanParam->Boolean();
-        UpdateToolbar(); 
-        }     
-    }
-
-// ---------------------------------------------------------
-// CPhoneToolbarController::SetBTAccAvailableFlag
-// ---------------------------------------------------------
-//
-void CPhoneToolbarController::SetBTAccAvailableFlag( TPhoneCommandParam* aCommandParam )
-    {
-    // Check is the given parameter valid
-    if ( aCommandParam->ParamId() == TPhoneCommandParam::EPhoneParamIdBoolean )
-        {
-        TPhoneCmdParamBoolean* accFlag = 
-            static_cast<TPhoneCmdParamBoolean*>( aCommandParam );
-
-        iBTAccAvailableFlag = accFlag->Boolean();
-        UpdateToolbar();
-        }
-    }
-
 
 // ---------------------------------------------------------
 // CPhoneToolbarController::SetCallInProgressFlag
@@ -518,7 +456,6 @@
     iToolbar->SetItemDimmed( EPhoneInCallCmdUnmute, aDimmed, ETrue );
     iToolbar->SetItemDimmed( EPhoneInCallCmdActivatEPhonebook, aDimmed, ETrue );
     iToolbar->SetItemDimmed( EPhoneInCallCmdHandset, aDimmed, ETrue );  
-    iToolbar->SetItemDimmed( EPhoneInCallCmdBtHandsfree, aDimmed, ETrue );
     // Don't dim/undim iHF when complete toolbar dimming is changed. 
     if ( !iWiredAccFlag )
         {