--- a/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp	Thu Aug 19 10:05:08 2010 +0300
+++ b/startupservices/startupanimation/sanimctrl/src/sanimstartupctrl.cpp	Tue Aug 31 15:24:25 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -16,15 +16,16 @@
 */
 
 
-#include <aknappui.h>
-#include <aknsoundsystem.h>
+
+ #include <eikappui.h>
+
 #include <centralrepository.h>
 #include <featmgr.h>
 #include <MediatorDomainUIDs.h>
 #include <Profile.hrh>
 #include <ProfileEngineSDKCRKeys.h>
 #include "sanimengine.h"
-#include <secondarydisplay/SecondaryDisplayStartupAPI.h>
+#include <SecondaryDisplay/SecondaryDisplayStartupAPI.h>
 
 #include "sanimstartupctrl.h"
 #include "trace.h"
@@ -35,7 +36,7 @@
 const TInt KDefaultRepeatCount( 1 ); /** Default repeat count for animation and tone. */
 const TInt KDefaultVolumeRamp( 0 );  /** Default volume ramp value in microseconds. */
 
-static const TInt KMediatorTimeout( 1000000 ); /** Default timeout for Mediator commands. */
+//static const TInt KMediatorTimeout( 1000000 ); /** Default timeout for Mediator commands. */
 
 // ======== LOCAL FUNCTIONS ========
 
@@ -197,7 +198,7 @@
         else if ( iCommandInitiator )
             {
             INFO_1( "Secondary display data: %d", iSyncCommand );
-
+		
             iClientStatus = &aStatus;
             iWaitingForSyncResponse = ETrue;
             TInt errorCode = iCommandInitiator->IssueCommand(
@@ -314,7 +315,7 @@
         {
         iWaitingForSyncResponse = EFalse;
         StartAnimation();
-        }
+       }
     }
 
 
@@ -349,21 +350,7 @@
         FeatureManager::FeatureSupported( KFeatureIdCoverDisplay );
     FeatureManager::UnInitializeLib();
 
-    if ( secondaryDisplaySupported )
-        {
-        iCommandInitiator = CMediatorCommandInitiator::NewL( this );
-        iCommandResponder = CMediatorCommandResponder::NewL( this );
-
-        TInt errorCode = iCommandResponder->RegisterCommand(
-            KMediatorSecondaryDisplayDomain,
-            SecondaryDisplay::KCatStartup,
-            SecondaryDisplay::ECmdStartupPhaseSkip,
-            TVersion( 0, 0, 0 ),
-            ECapabilitySwEvent,
-            KMediatorTimeout );
-        ERROR( errorCode, "Failed to register command ECmdStartupPhaseSkip with mediator" );
-        User::LeaveIfError( errorCode );
-        }
+   
 
     CSAnimCtrl::BaseConstructL( aRect, aContainer );
     }
@@ -504,7 +491,7 @@
         if ( iPlayDefaultBeep )
             {
             INFO( "Default startup beep requested" );
-
+            /*
             CAknAppUi* appUi = static_cast<CAknAppUi*>( iEikonEnv->EikAppUi() );
             if ( appUi )
                 {
@@ -512,6 +499,7 @@
 
                 appUi->KeySounds()->PlaySound( EAvkonSIDPowerOnTone );
                 }
+             */
             }
 
         iEngine->Start( *iClientStatus );