diff -r 7333d7932ef7 -r 8b7f4e561641 installationservices/swi/source/sislauncher/server/sislauncherserver.h --- a/installationservices/swi/source/sislauncher/server/sislauncherserver.h Tue Aug 31 15:21:33 2010 +0300 +++ b/installationservices/swi/source/sislauncher/server/sislauncherserver.h Wed Sep 01 12:22:02 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of the License "Eclipse Public License v1.0" @@ -27,9 +27,7 @@ #include #include #include -#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK -#include -#endif + #ifndef _CSISLAUNCHERSERVER_H_ #define _CSISLAUNCHERSERVER_H_ @@ -93,9 +91,6 @@ void ShutdownL(); void ShutdownL(TUid aUid, TInt aTimeout); void NotifyNewAppsL(const RPointerArray& aFiles); - #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK - void NotifyNewAppsL(const RPointerArray& aApplicationRegistrationData); - #endif #endif void HandleShutdownL(TThreadId aThread, TBool aKillOnTimeout = EFalse); void ForceShutdownL(TUid aUid); @@ -105,16 +100,15 @@ CSisLauncherServer(); void ConstructL(); CSession2* NewSessionL(const TVersion& aVersion, const RMessage2& aMessage) const; + void LongServerShutdown(); void ShortServerShutdown(); void CancelShutdown(); - #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK - virtual TCustomResult CustomSecurityCheckL(const RMessage2& aMsg, TInt& aAction, TSecurityInfo& aMissing); - #endif + // Server Policies // separate the policies into handled and not handled #ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK - static const TUint iRangeCount=6; + static const TUint iRangeCount=4; #else static const TUint iRangeCount=2; #endif