--- a/phoneapp/phoneuiview/src/cphoneview.cpp	Mon Mar 15 12:40:24 2010 +0200
+++ b/phoneapp/phoneuiview/src/cphoneview.cpp	Wed Mar 31 21:30:06 2010 +0300
@@ -66,11 +66,7 @@
 // -----------------------------------------------------------------------------
 //
 CPhoneView::CPhoneView( CEikButtonGroupContainer& aCba ) :
-    iSecurityMode ( EFalse ),
-    iActivatePreviousApp( EFalse ),
-    iPhoneAppViewToDialer( EFalse ),
-    iCba ( aCba ),
-    iDialerActivation( EFalse )
+    iCba ( aCba )
     {
     }
 
@@ -151,7 +147,7 @@
                 if ( iSecurityMode )
                     {
                     static_cast<MEikCommandObserver*>( iEikonEnv->EikAppUi() )
-                    ->ProcessCommandL( EPhoneNumberAcqSecurityDialer );
+						->ProcessCommandL( EPhoneViewOpenNumberEntry );
                     return;
                     }
                  else
@@ -313,8 +309,7 @@
         }
     else
         {
-        if ( Layout_Meta_Data::IsLandscapeOrientation() ||
-             iSecurityMode )
+        if ( Layout_Meta_Data::IsLandscapeOrientation() )
             {
             // In landscape and in security mode aRect is ok.
             CCoeControl::SetRect( aRect );    
@@ -371,8 +366,7 @@
         MAknsSkinInstance* skin = AknsUtils::SkinInstance();
         MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
         
-        if ( iSecurityMode || 
-            !AknsDrawUtils::Background( skin, cc, this, gc, aRect ) )
+        if ( !AknsDrawUtils::Background( skin, cc, this, gc, aRect ) )
             {
             gc.SetPenStyle(CGraphicsContext::ENullPen);
             gc.SetBrushColor( AKN_LAF_COLOR( 0 ) ); // 0 for white
@@ -502,23 +496,10 @@
 //
 void CPhoneView::SetSecurityMode ( TBool aStatus )
     {
-    if ( iSecurityMode != aStatus ) 
-        {
-        iSecurityMode = aStatus;
-        SizeChanged();    
-        }
+    iSecurityMode = aStatus;
     }
     
 // -----------------------------------------------------------------------------
-// CPhoneView::IsSecurityMode
-// -----------------------------------------------------------------------------
-//
-TBool CPhoneView::IsSecurityMode()    
-    {
-    return iSecurityMode;
-    }
-
-// -----------------------------------------------------------------------------
 // CPhoneView::GetActivatePreviousApp
 // -----------------------------------------------------------------------------
 //