--- a/breakdeps/MCSSatHandler/mcssathandler.cpp	Wed Nov 03 16:17:59 2010 +0000
+++ b/breakdeps/MCSSatHandler/mcssathandler.cpp	Wed Nov 03 16:32:04 2010 +0000
@@ -48,8 +48,6 @@
 // -----------------------------------------------------------------------------
 CMcsSatHandler::~CMcsSatHandler()
     {
-    iSatIcon.Close(); 
-    iSatSession.Close();
     }
 
 // -----------------------------------------------------------------------------    
@@ -57,51 +55,7 @@
 // -----------------------------------------------------------------------------
 EXPORT_C CAknIcon* CMcsSatHandler::LoadIconL()
     {
-    TInt iconId( KErrNone );
-    User::LeaveIfError( RProperty::Get( KCRUidMenu, KMenuSatUIIconId, iconId ) );
-    CAknIcon* icon = CAknIcon::NewL(); 
-    CleanupStack::PushL(icon);
-    if( iconId != KErrNone )
-        {
-        RIconEf iIconEf;
-        iSatIcon.GetIconInfoL( TUint8( iconId ), iIconEf ); 
-        CleanupClosePushL( iIconEf );
-        CFbsBitmap* bitmap = GetBitmapL( iIconEf );
-            if( !bitmap )
-                {
-                CFbsBitmap* mask( NULL );
-                CleanupStack::PushL( mask );    
-                
-                icon->SetBitmap( bitmap );
-                // create and set mask
-                User::LeaveIfError( mask->Create( bitmap->SizeInPixels(), EGray256 ) );
-                
-                CFbsBitmapDevice* maskDevice = CFbsBitmapDevice::NewL( mask );
-                CleanupStack::PushL( maskDevice ); 
-                CFbsBitGc* maskGc;
-                User::LeaveIfError( maskDevice->CreateContext( maskGc ) );
-                CleanupStack::PushL( maskGc );
-                maskGc->SetBrushStyle( CGraphicsContext::ESolidBrush );
-                maskGc->SetDrawMode( CGraphicsContext::EDrawModePEN );
-                maskGc->SetBrushColor( KRgbBlack );
-                maskGc->Clear();            
-                maskGc->SetBrushColor( KRgbWhite );             
-                maskGc->DrawRect( TRect( TPoint( ), bitmap->SizeInPixels() ) );                
-                icon->SetMask( mask );
-                
-                CleanupStack::PopAndDestroy( maskGc );
-                CleanupStack::PopAndDestroy( maskDevice );
-                CleanupStack::Pop( mask );
-                }
-        CleanupStack::PopAndDestroy( &iIconEf ); // iIconEf
-        CleanupStack::Pop( icon );
-        }
-    else
-        {
-        CleanupStack::PopAndDestroy( icon );
-        icon = NULL;
-        }
-    return icon;    
+    return NULL;    
     }
 
 // ---------------------------------------------------------------------------
@@ -119,12 +73,7 @@
 //        
 EXPORT_C TBool CMcsSatHandler::CheckVisibility() 
     {
-    TInt visibility( KErrNone );
-    TInt err = RProperty::Get( KCRUidMenu, KMenuShowSatUI, visibility );
-    if( err == KErrNone && visibility )
-        return ETrue;
-    else
-        return EFalse;
+    return EFalse;
     }
 
 
@@ -145,55 +94,7 @@
 //
 void CMcsSatHandler::ConstructL()
     {
-    iSatSession.ConnectL();
-    iSatIcon.OpenL( iSatSession ); 
     }
 
-// ---------------------------------------------------------------------------
-// CMenuSATHandler::GetVisibility
-// ---------------------------------------------------------------------------
-// 
-CFbsBitmap* CMcsSatHandler::GetBitmapL( const RIconEf& aIconEF )
-    {
-    TInt selectedIconIndex( KErrNotFound );
-    TSize selectedIconSize( 0, 0 );
-    CFbsBitmap* bitmap( NULL );
-    for ( TInt i = 0; i < aIconEF.Count(); ++i )
-        {
-        if( ( aIconEF[i].IconSize().iHeight * aIconEF[i].IconSize().iWidth ) >= 
-            ( selectedIconSize.iHeight * selectedIconSize.iWidth ) )
-            if( bitmap )
-                {
-                delete bitmap;
-                bitmap = NULL;
-                }
-            // test and select index of iIcon which is not too big
-            TRAPD( bitmapErr, bitmap = iSatIcon.GetIconL( aIconEF[ i ] ) );
-            if( !bitmapErr && bitmap ) //!iBitmap if iIcon is too big
-                {
-                selectedIconSize = aIconEF[i].IconSize();
-                selectedIconIndex = i;
-                }
-            else if( bitmapErr )
-                {
-                User::Leave( bitmapErr );
-                }
-            }
-    if( selectedIconIndex != KErrNotFound )
-        {
-        if( bitmap )
-            {
-            delete bitmap;
-            bitmap = NULL;
-            }
-        TRAPD( bitmapErr, bitmap = iSatIcon.GetIconL( aIconEF[ selectedIconIndex ] ) );
-        User::LeaveIfError( bitmapErr );    
-        return bitmap;
-        }
-    else 
-        {
-        return NULL;
-        }    
-    }    
     
 //  End of File