--- a/backsteppingsrv/group/bld.inf Thu Dec 17 08:54:17 2009 +0200
+++ b/backsteppingsrv/group/bld.inf Thu Jan 07 12:55:39 2010 +0200
@@ -27,9 +27,7 @@
PRJ_EXPORTS
../rom/backsteppingservice.iby CORE_MW_LAYER_IBY_EXPORT_PATH(backsteppingservice.iby)
-../data/bs_config.xml /epoc32/data/Z/private/2000F83E/bs_config.xml
-../data/bs_config.xml /epoc32/release/winscw/udeb/Z/private/2000F83E/bs_config.xml
-../data/bs_config.xml /epoc32/release/winscw/urel/Z/private/2000F83E/bs_config.xml
+../data/bs_config.xml Z:/private/2000F83E/bs_config.xml
../inc/bsclient.h |../../inc/bsclient.h
../inc/bsengineglobals.h |../../inc/bsengineglobals.h
--- a/contentpublishingsrv/contentpublishingserver/cpserver/group/bld.inf Thu Dec 17 08:54:17 2009 +0200
+++ b/contentpublishingsrv/contentpublishingserver/cpserver/group/bld.inf Thu Jan 07 12:55:39 2010 +0200
@@ -23,14 +23,10 @@
PRJ_EXPORTS
-../data/backup_registration.xml /epoc32/release/winscw/udeb/z/private/20016b7b/backup_registration.xml
-../data/backup_registration.xml /epoc32/release/winscw/urel/z/private/20016b7b/backup_registration.xml
-../data/backup_registration.xml /epoc32/data/z/private/20016b7b/backup_registration.xml
+../data/backup_registration.xml z:/private/20016b7b/backup_registration.xml
// Cenrep
-../data/20016b7b.txt /epoc32/release/winscw/udeb/z/private/10202be9/20016b7b.txt
-../data/20016b7b.txt /epoc32/release/winscw/urel/z/private/10202be9/20016b7b.txt
-../data/20016b7b.txt /epoc32/data/z/private/10202be9/20016b7b.txt
+../data/20016b7b.txt z:/private/10202be9/20016b7b.txt
../inc/cpglobals.h |../../../../inc/cpglobals.h
../inc/cpserverdef.h |../../../../inc/cpserverdef.h
--- a/homescreenpluginsrv/group/bld.inf Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreenpluginsrv/group/bld.inf Thu Jan 07 12:55:39 2010 +0200
@@ -34,9 +34,6 @@
#include "../hspsresource/group/bld.inf"
#include "../hspsresult/group/bld.inf"
#include "../homescreen_settings_api/group/bld.inf"
-#ifdef _HSPS_AUTOINSTALL_TEST_THEMES_
-#include "../internal/testthemes/group/bld.inf"
-#endif
PRJ_PLATFORMS
@@ -50,10 +47,6 @@
../rom/hsps.iby CORE_MW_LAYER_IBY_EXPORT_PATH(hsps.iby)
-#ifdef _HSPS_AUTOINSTALL_TEST_THEMES_
-../rom/hspstestconfigurations.iby CORE_MW_LAYER_IBY_EXPORT_PATH(hspstestconfigurations.iby)
-#endif
-
// Generic configuration interface for component cenrep settings
../conf/hsps.confml APP_LAYER_CONFML(hsps.confml)
--- a/homescreenpluginsrv/homescreen_settings_api/src/hspluginsettings.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreenpluginsrv/homescreen_settings_api/src/hspluginsettings.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -17,8 +17,8 @@
-#include <LiwServiceHandler.h>
-#include <LiwVariant.h>
+#include <liwservicehandler.h>
+#include <liwvariant.h>
#include <bamdesca.h>
#include <hspluginsettings.h>
--- a/homescreenpluginsrv/hspsmanager/group/bld.inf Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreenpluginsrv/hspsmanager/group/bld.inf Thu Jan 07 12:55:39 2010 +0200
@@ -36,7 +36,3 @@
hspsrequestclient.mmp
hspsthemeserver.mmp
-#include "../tools/bld.inf"
-
-//PRJ_TESTMMPFILES
-//
--- a/homescreenpluginsrv/hspsmanager/src/hspsmaintenancehandler.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreenpluginsrv/hspsmanager/src/hspsmaintenancehandler.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -2542,9 +2542,7 @@
ChspsODT& aOdt,
ChspsDomDocument& aDom )
{
- TInt error;
ChspsDomNode* node = aOdt.DomDocument().RootNode();
-
ChspsDomNode* controlNode = &(FindNodeByTagL(KControlElement, *node ));
if( !controlNode )
@@ -2559,7 +2557,7 @@
{
return KErrNotFound;
}
-
+
TInt index = controlNode->ItemIndex( *settingsNode );
controlNode->DeleteChild(settingsNode);
@@ -2568,7 +2566,9 @@
ChspsDomNode* iterNode = iter->First();
ChspsDomNode* prevNode = NULL;
TBool jobDone = EFalse;
-
+
+ TInt error( KErrNotFound );
+
while( iterNode && !jobDone && iterNode != prevNode)
{
const TDesC8& name = iterNode->Name();
@@ -2590,8 +2590,8 @@
CleanupStack::PopAndDestroy( iter );
return error;
+ }
- }
// Service for updating plugin positions
// -----------------------------------------------------------------------------
//
--- a/homescreenpluginsrv/hspsmanager/src/hspsserverutil.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreenpluginsrv/hspsmanager/src/hspsserverutil.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -566,6 +566,24 @@
const TPath& aTargetPath,
const TFileName& aSourceFile )
{
+ // Construct target file with full path.
+ TFileName targetFile;
+
+ TParse targetParser;
+ targetParser.Set( aTargetPath, NULL, NULL );
+
+ if( targetParser.NamePresent() )
+ {
+ targetFile = aTargetPath;
+ }
+ else
+ {
+ TParse sourceParser;
+ sourceParser.Set( aSourceFile, NULL, NULL );
+ targetFile = targetParser.DriveAndPath();
+ targetFile.Append( sourceParser.NameAndExt() );
+ }
+
// Make target folder
TInt error = aFs.MkDirAll( aTargetPath );
if( error == KErrAlreadyExists )
@@ -581,7 +599,7 @@
// Check whether the resource needs to be copied
if ( hspsServerUtil::ResourceCopyIsRelevantL(
aSourceFile,
- aTargetPath,
+ targetFile,
aFs )
)
{
--- a/homescreenpluginsrv/hspsmanager/tools/bld.inf Thu Dec 17 08:54:17 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
-* Copyright (c) 2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-PRJ_PLATFORMS
-WINSCW
-
-#include "../../inc/hsps_builds_cfg.hrh"
-
-PRJ_MMPFILES
-hspsthemeinstallercons.mmp
-
--- a/homescreenpluginsrv/hspsmanager/tools/hspsthemeinstallercons.cpp Thu Dec 17 08:54:17 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,610 +0,0 @@
-/*
-* Copyright (c) 2004,2008 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#include "hspsthemeinstallercons.h"
-#include <e32svr.h>
-#include <flogger.h>
-#include <f32file.h>
-#include "hspsthememanagement.h"
-#include <e32base.h>
-#include <bacline.h>
-#include <bautils.h>
-
-#include "hspsodt.h"
-#include "hspsclient.h"
-
-_LIT(KDATFileExtension,".dat");
-_LIT(KLogFile,"hspsthemeinstallercons.log");
-_LIT(KLogFolder,"hspsthemeinstallercons");
-_LIT(KLogFilePath,"c:\\logs\\hspsthemeinstallercons\\hspsthemeinstallercons.log");
-_LIT(KThemeSourcePath,"c:\\data\\installs\\test\\");
-_LIT(KDefaultInput, "install.dat");
-
-#define _WRITELOG(aDescription) RFileLogger::Write( KLogFolder,KLogFile,EFileLoggingModeOverwrite, aDescription );
-#define _WRITE_ERRORLOG(aErrCode) WriteErrorLog(aErrCode);
-
-
-
-class CThemeInstaller:public CBase, public MhspsThemeManagementServiceObserver
- {
- public:
- ~CThemeInstaller();
- static CThemeInstaller* NewL(TInt aAppUid);
- static CThemeInstaller* NewLC(TInt aAppUid);
- void StartL();
-
- private:
- void InstallThemeL(const TDesC& aManifestFileName);
- void InstallFilesL(CDesCArraySeg& aManifestFile);
- void GetFilesL(RFs& aFs, CDesCArraySeg& aFileList, const TDesC& aDirectory);
- void DeleteDirL(RFs& aFs, const TDesC& aDir);
- void HandlehspsClientMessage(ThspsServiceCompletedMessage aMessage);
- void ConstructL(TInt aAppUid);
- void GetDirectoriesL(
- RFs& aFs,
- TPtrC aPath,
- TPtrC aPluginsFile,
- CDesCArrayFlat& aDirectoryList );
- void InstallFilesFromL(
- RFs& aFs,
- TPtrC aDirectory );
- private:
- TBuf8<KMaxHeaderDataLength8> iHeaderData;
- TRequestStatus iStatus;
- ChspsClient *ihspsClient;
- ChspsResult* iResult;
- TInt iConvertedResourceCount;
- ChspsODT* iHeader;
- TInt iListCount;
- CDesCArraySeg* iThemeList;
- TInt iAppUid;
- };
-
-CThemeInstaller* themeinstaller;
-CActiveScheduler* scheduler;
-
-
-
-
-
-// -----------------------------------------------------------------------------
-// E32Main
-// -----------------------------------------------------------------------------
-//
-GLDEF_C TInt E32Main() // main function called by E32
- {
- CTrapCleanup* cleanup = CTrapCleanup::New(); // get clean-up stack
- TRAPD( error, startupL() ); // more initialization, then do example
-
- delete scheduler;
- delete themeinstaller;
- delete cleanup; // destroy clean-up stack
-
- // Forward errors to be catched with ERRORLEVEL method in batch files
- return error; // and return
- }
-
-// -----------------------------------------------------------------------------
-// WriteErrorLog
-//
-// Writes error to log
-// -----------------------------------------------------------------------------
-//
-void WriteErrorLog(TInt error)
- {
- if (error == ENoFilesNotFound)
- {
- _WRITELOG( _L("ERROR::Theme files not found") );
- }
- else if (error == EErrorDeletingDir)
- {
- _WRITELOG( _L("ERROR::Could not delete themes") );
- }
- else if (error == EErrorDirNotExists)
- {
- _WRITELOG( _L("ERROR::Source directory does not exist") );
- }
- else
- {
- _WRITELOG( _L("ERROR::Unknown error") );
- }
- }
-
-
-// -----------------------------------------------------------------------------
-// startup
-//
-//
-// -----------------------------------------------------------------------------
-//
-void startupL()
- {
- TInt errorCode = KErrNone;
-
- // Start active scheduler
- scheduler = new ( ELeave ) CActiveScheduler;
- CleanupStack::PushL( scheduler );
- CActiveScheduler::Install( scheduler );
-
- TUid appuid = KUidhspsThemeInstallerCons;
- themeinstaller = CThemeInstaller::NewL( appuid.iUid );
- CleanupStack::PushL( themeinstaller );
-
- TRAP( errorCode, themeinstaller->StartL() );
-
- _WRITELOG( _L("") );
-
- if( errorCode )
- {
- _WRITE_ERRORLOG( errorCode );
- _WRITELOG( _L("Failed to start an installation!") );
- }
-
- _WRITELOG( _L("Installer done") );
-
- CleanupStack::Pop( themeinstaller );
- CleanupStack::Pop( scheduler );
-
- User::LeaveIfError( errorCode );
- }
-
-// -----------------------------------------------------------------------------
-// CThemeInstaller::NewL()
-//
-//
-// -----------------------------------------------------------------------------
-//
-CThemeInstaller* CThemeInstaller::NewL( TInt aAppUid )
- {
- CThemeInstaller* self = NewLC( aAppUid );
- CleanupStack::Pop( self );
- return( self );
- }
-
-// -----------------------------------------------------------------------------
-// CThemeInstaller::NewLC()
-//
-//
-// -----------------------------------------------------------------------------
-//
-CThemeInstaller* CThemeInstaller::NewLC( TInt aAppUid )
- {
- CThemeInstaller* self = new ( ELeave ) CThemeInstaller();
- CleanupStack::PushL( self );
- self->ConstructL( aAppUid );
- return self;
- }
-
-// -----------------------------------------------------------------------------
-// CThemeInstaller::ConstructL()
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CThemeInstaller::ConstructL( TInt aAppUid )
- {
- iResult = ChspsResult::NewL();
- ihspsClient = ChspsClient::NewL( *this );
- iHeader = NULL;
- iListCount = 0;
- iConvertedResourceCount = 0;
- iAppUid = aAppUid;
- iThemeList = NULL;
- }
-
-// -----------------------------------------------------------------------------
-// CThemeInstaller::~CThemeInstaller()
-//
-//
-// -----------------------------------------------------------------------------
-//
-CThemeInstaller:: ~CThemeInstaller()
- {
- delete ihspsClient;
- delete iResult;
- delete iHeader;
- delete iThemeList;
- }
-
-// -----------------------------------------------------------------------------
-// Gets program arguments and starts the installer
-// -----------------------------------------------------------------------------
-//
-void CThemeInstaller::StartL()
- {
- // Init
- RFs fs;
- User::LeaveIfError( fs.Connect() );
- CleanupClosePushL( fs );
-
- // Set logging
- fs.MkDirAll( KLogFilePath );
- _WRITELOG(_L("Starting installer"));
-
- // Check arguments
- CCommandLineArguments* args = CCommandLineArguments::NewLC();
- TInt argsCount = args->Count();
- TPtrC inputFile;
- const TInt firstArgIndex = 2;
- if ( argsCount < firstArgIndex )
- {
- _WRITELOG(_L("Missing an argument!"));
-// User::LeaveIfError( KErrArgument );
- inputFile.Set( KDefaultInput );
- }
- else
- {
- inputFile.Set( args->Arg(1) );
- }
-
- // Setup an array for directory names
- const TInt KGranularity = 10;
- CDesCArrayFlat* directoryList = new ( ELeave ) CDesCArrayFlat( KGranularity );
- CleanupStack::PushL( directoryList );
-
- // Get directory names
- GetDirectoriesL( fs, KThemeSourcePath().Ptr(), inputFile, *directoryList );
-
- // Install manifest files from the directories
- TInt count = directoryList->MdcaCount();
- for( TInt i=0; i<count; i++ )
- {
- TPtrC dirPtr( directoryList->MdcaPoint(i) );
- InstallFilesFromL( fs, dirPtr );
- }
-
- CleanupStack::PopAndDestroy( 3, &fs ); // directoryList, args, Fs
- }
-
-// -----------------------------------------------------------------------------
-// Installs a new configuration from the provided manifest file.
-// -----------------------------------------------------------------------------
-//
-void CThemeInstaller::InstallFilesFromL(
- RFs& aFs,
- TPtrC aDirectory )
- {
- TInt errorCode = EErrorDirNotExists;
-
- // Check if the dir exists
- BaflUtils baf;
- if( baf.PathExists( aFs, aDirectory ) )
- {
- errorCode = KErrNone;
-
- // Setup an array for manifests (member variable)
- if ( iThemeList )
- {
- delete iThemeList;
- iThemeList = NULL;
- }
- iThemeList = new( ELeave ) CDesCArraySeg( KArrGranularity );
-
- // Get manifests located at the directory
- GetFilesL( aFs, *iThemeList, aDirectory );
- if( iThemeList->Count() > 0 )
- {
- // Install first manifest
- InstallThemeL( iThemeList->MdcaPoint( 0 ) );
-
- // Handle asynch messages
- scheduler->Start();
- }
- else
- {
- errorCode = ENoFilesNotFound;
- }
- }
-
- User::LeaveIfError( errorCode );
- }
-
-// -----------------------------------------------------------------------------
-// Reads directory names from the input file and appends names into the provided array
-// -----------------------------------------------------------------------------
-//
-void CThemeInstaller::GetDirectoriesL(
- RFs& aFs,
- TPtrC aPath,
- TPtrC aPluginsFile,
- CDesCArrayFlat& aDirectoryList )
- {
- TFileName directoryFile;
- directoryFile.Copy( aPath );
- directoryFile.Append( aPluginsFile );
-
- // Convert into a 8-bit descriptor
- _LIT8(KLogPrefix, "Reading directory names from the " );
- _LIT8(KLogSuffix, " file.." );
- const TInt lineLength = KLogPrefix().Length() + directoryFile.Length() + KLogSuffix().Length();
- HBufC8* line = HBufC8::NewLC(lineLength );
- TPtr8 linePtr( line->Des() );
- linePtr.Append( KLogPrefix );
- linePtr.Append( directoryFile );
- linePtr.Append( KLogSuffix );
- _WRITELOG( linePtr );
- CleanupStack::PopAndDestroy( line );
- line = NULL;
-
- // Check if the f exists
- BaflUtils baf;
- if( !baf.FileExists( aFs, directoryFile ) )
- {
- _WRITELOG(_L("File not found!"));
- User::LeaveIfError( KErrNotFound );
- }
-
- // Open a file handle
- RFile file;
- User::LeaveIfError( file.Open(aFs, directoryFile, EFileRead|EFileShareReadersOnly) );
- CleanupClosePushL(file);
-
- // Get size of the file
- TInt fileSize;
- User::LeaveIfError( file.Size(fileSize) );
-
- // Get file content
- HBufC8* buf8 = HBufC8::NewLC( fileSize );
- TPtr8 ptr8( buf8->Des() );
- User::LeaveIfError( file.Read(ptr8) );
-
- // Convert from a 8bit to 16bit descriptor
- HBufC16* buf16 = HBufC16::NewLC( ptr8.MaxLength() );
- TPtr16 ptr16 = buf16->Des();
- ptr16.Copy( ptr8 );
-
- // Parse directories from the string
- TInt offset = 0;
- _LIT(KLineSeperator, "\r\n");
- _LIT(KDirectorySuffix, "\\");
- do
- {
- offset = ptr16.Find( KLineSeperator );
- TPtrC ptr;
- if ( offset < 1 )
- {
- ptr.Set( ptr16 );
- }
- else
- {
- ptr.Set( ptr16.Left( offset ) );
- }
- if ( ptr.Length() )
- {
- HBufC* nameBuf = HBufC::NewLC( aPath.Length() + ptr.Length() + KDirectorySuffix().Length() );
- TPtr fullPtr( nameBuf->Des() );
- fullPtr.Copy( aPath );
- fullPtr.Append( ptr );
- fullPtr.Append( KDirectorySuffix );
- aDirectoryList.AppendL( fullPtr );
- CleanupStack::PopAndDestroy( nameBuf );
- }
- if ( offset > 0 )
- {
- ptr16 = ptr16.Mid( offset + KLineSeperator().Length() );
- }
- }
- while ( offset > 0 );
-
- // Cleanup
- CleanupStack::PopAndDestroy( buf16 );
- CleanupStack::PopAndDestroy( buf8 );
- CleanupStack::PopAndDestroy( ); // file
- }
-
-// -----------------------------------------------------------------------------
-// Deletes theme installation path
-// -----------------------------------------------------------------------------
-//
-void CThemeInstaller::DeleteDirL( RFs& aFs, const TDesC& aDir )
- {
- _WRITELOG( _L("Deleting existing themes") );
-
- HBufC* path = HBufC::NewLC( KMaxFileName );
- TPtr pathPtr = path->Des();
- pathPtr.Append( aDir );
-
- CFileMan* fileMan = CFileMan::NewL( aFs );
- CleanupStack::PushL( fileMan );
- TInt err = fileMan->RmDir( pathPtr );
-
- CleanupStack::PopAndDestroy( fileMan );
- CleanupStack::PopAndDestroy( path );
-
- if( err )
- {
- _WRITE_ERRORLOG( EErrorDeletingDir );
- }
- }
-
-// -----------------------------------------------------------------------------
-// Searches for theme files from path and adds them to list
-// -----------------------------------------------------------------------------
-//
-void CThemeInstaller::GetFilesL( RFs& aFs, CDesCArraySeg& aFileList, const TDesC& aDirectory )
- {
- CDir* dirList;
- User::LeaveIfError( aFs.GetDir( aDirectory,
- KEntryAttMaskSupported, ESortByDate, dirList ) );
-
- CleanupStack::PushL( dirList );
-
- for( TInt i = 0; i < dirList->Count(); i++ )
- {
- if ( !( *dirList )[i].IsDir() )
- {
- HBufC* path = HBufC::NewLC( aDirectory.Length() + ( *dirList )[i].iName.Length() );
- TPtr pathPtr = path->Des();
- pathPtr.Copy( aDirectory );
- TEntry entry = ( *dirList )[i];
- pathPtr.Append( entry.iName );
- TParse p;
- p.Set( pathPtr, NULL, NULL );
-
- if ( p.Ext().CompareF( KDATFileExtension ) == 0 )
- {
- aFileList.AppendL( pathPtr );
- }
-
- CleanupStack::PopAndDestroy( path );
- }
- }
-
- CleanupStack::PopAndDestroy( dirList );
- }
-
-// -----------------------------------------------------------------------------
-// Initiates installing of a confgiruation from the provided manifest file
-// -----------------------------------------------------------------------------
-//
-void CThemeInstaller::InstallThemeL( const TDesC& aManifestFileName )
- {
-
- TBuf<KMaxHeaderDataLength8> tmp;
- _WRITELOG(_L(""));
- tmp.Format( _L("Manifest: %S"), &aManifestFileName );
- _WRITELOG(tmp);
-
- if ( iHeader )
- {
- delete iHeader;
- iHeader = NULL;
- }
- iHeader = ChspsODT::NewL();
-
- TParse p;
- p.Set( aManifestFileName, NULL, NULL );
- TPtrC ptr = p.NameAndExt();
-
- ThspsServiceCompletedMessage ret = ihspsClient->hspsInstallTheme( aManifestFileName, *iHeader );
-
- if( ret == EhspsInstallThemeSuccess )
- {
- ihspsClient->GethspsResult( *iResult );
- }
- else if( ret == EhspsInstallPhaseSuccess )
- {
- ihspsClient->GethspsResult( *iResult );
- iConvertedResourceCount = 0;
-
- tmp.Format( _L("Installing ..") );
- _WRITELOG(tmp);
- ihspsClient->hspsInstallNextPhaseL( *iHeader );
- }
- else if( ret == EhspsInstallThemeFailed )
- {
- ihspsClient->GethspsResult(*iResult);
- TBuf<KMaxHeaderDataLength8> tmp2;
- TInt syserr = iResult->iSystemError;
- TInt hspserr = iResult->iXuikonError;
- tmp.Format(_L("Installation of \'%S\' failed. System error: %d, HSPS error: %d."), &ptr, syserr, hspserr );
- _WRITELOG(tmp);
- User::Leave( KErrGeneral );
- }
- else if( ret == EhspsServiceNotSupported )
- {
- _WRITELOG(_L("EhspsServiceNotSupported"));
- }
- else if( ret == EhspsServiceRequestError )
- {
- _WRITELOG(_L("EhspsServiceRequestError"));
- }
- else if( ret == EhspsServiceRequestCanceled )
- {
- _WRITELOG(_L("EhspsServiceRequestCanceled"));
- }
- else
- {
- tmp.Format(_L("Undefined response: %d"), ret);
- _WRITELOG(tmp);
- }
- }
-
-// -----------------------------------------------------------------------------
-// CThemeInstaller::HandlehspsClientMessage()
-//
-// Handles events received from themeserver via hspsClient
-// -----------------------------------------------------------------------------
-
-void CThemeInstaller::HandlehspsClientMessage(ThspsServiceCompletedMessage aEvent)
- {
- TInt errorCode = KErrNone;
-
- TBuf<KMaxHeaderDataLength8> tmp;
- ihspsClient->GethspsResult(*iResult);
-
- if( aEvent == EhspsInstallThemeSuccess )
- {
- iListCount++;
-
- if ( iListCount < iThemeList->MdcaCount() )
- {
- TRAP( errorCode, InstallThemeL( iThemeList->MdcaPoint( iListCount ) ) );
-
- if( errorCode )
- {
- tmp.Format( _L("InstallThemeL() failed...") );
- _WRITELOG( tmp );
- }
- }
- else
- {
- scheduler->Stop();
- }
- }
- else if( aEvent == EhspsInstallPhaseSuccess )
- {
-
- TBuf<KMaxHeaderDataLength8> tmp;
-
- if( iResult->iIntValue1 == EhspsPhaseCleanup )
- {
- tmp.Format(_L("Removing previous configuration .."));
- }
- else if( iResult->iIntValue1 == EhspsPhaseInstallSkeleton )
- {
- tmp.Format(_L("Installing a new configuration .."));
- }
- else
- {
- tmp.Format(_L("Processing phase %d .."), iResult->iIntValue1 );
- }
-
- _WRITELOG(tmp);
-
- }
- else if( aEvent == EhspsInstallThemeFailed )
- {
-
- TBuf<KMaxHeaderDataLength8> tmp2;
- TInt syserr = iResult->iSystemError;
- TInt hspserr = iResult->iXuikonError;
- TInt defengerr = iResult->iIntValue1;
- TInt subcomperr = iResult->iIntValue2;
- tmp.Format(_L("Installation of /'%S/' failed. Sys.err: %d, hsps.err: %d, Def.eng.err: %d, subcomp.err: %d."),
- &iHeader->ThemeFullName(), syserr, hspserr, defengerr, subcomperr );
- _WRITELOG(tmp);
- scheduler->Stop();
- }
- else
- {
- tmp.Format(_L("Unknown event received: %d"), aEvent );
- _WRITELOG(tmp);
- }
- }
-
--- a/homescreenpluginsrv/hspsmanager/tools/hspsthemeinstallercons.h Thu Dec 17 08:54:17 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 2004 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-#ifndef __CommonFramework_H
-#define __CommonFramework_H
-
-#include <e32base.h>
-#include <e32cons.h>
-
-const TUid KUidhspsThemeInstallerCons = { 0x054FDF26 };
-const TInt KArrGranularity = 10;
-
-void startupL();
-
-enum TType
-{
- EArgumentsNotDefined= -1,
- ENoFilesNotFound = -2,
- EErrorDeletingDir = -3,
- EErrorDirNotExists = -4
-};
-
-
-
-#endif
-
--- a/homescreenpluginsrv/hspsmanager/tools/hspsthemeinstallercons.mmp Thu Dec 17 08:54:17 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#include <platform_paths.hrh>
-
-TARGET hspsthemeinstallercons.exe
-TARGETTYPE exe
-UID 0x100039CE 0x200159C6 //0x054FDF26
-SECUREID 0x200159C6
-
-CAPABILITY ALL -tcb -DRM
-MACRO __SYMBIAN32__
-
-SOURCEPATH .
-SOURCE hspsthemeinstallercons.cpp
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE /epoc32/include/libc
-SYSTEMINCLUDE /epoc32/include/xml
-
-USERINCLUDE .
-USERINCLUDE ../inc
-USERINCLUDE ../../inc
-
-LIBRARY euser.lib
-LIBRARY cone.lib
-LIBRARY eikcore.lib
-LIBRARY eikcoctl.lib
-LIBRARY eikctl.lib
-LIBRARY bafl.lib
-LIBRARY commonengine.lib
-LIBRARY efsrv.lib
-LIBRARY hspsclientsession.lib
-LIBRARY hspsclient.lib
-LIBRARY hspsodt.lib
-LIBRARY hspsresult.lib
-LIBRARY fbscli.lib
-LIBRARY estor.lib
-LIBRARY flogger.lib
-
-
-
-
-
-
-
-
-
--- a/homescreenpluginsrv/inc/hsps_builds_cfg.hrh Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreenpluginsrv/inc/hsps_builds_cfg.hrh Thu Jan 07 12:55:39 2010 +0200
@@ -38,10 +38,6 @@
// By default, should be undefined in official production builds.
#undef _HSPS_TESTAPP_
-// Controls whether internal test themes should be installed into the ROM drive.
-// By default, should be undefined in official production builds.
-#undef _HSPS_AUTOINSTALL_TEST_THEMES_
-
// Controls whether old RDebug-prints should be processed.
// By default, should be undefined in official production builds.
#undef _hsps_DEBUG_
@@ -65,8 +61,7 @@
// ***********************************************
#ifdef _hsps_INTERNAL_
#define ____HSPS_CFG_LOG_ON____
- #define _HSPS_TESTAPP_
- #define _HSPS_AUTOINSTALL_TEST_THEMES_
+ #define _HSPS_TESTAPP_
#define _hsps_DEBUG_
#define _hsps_SERVER_SHUTDOWN_ENABLED_
--- a/homescreenpluginsrv/rom/hsps.iby Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreenpluginsrv/rom/hsps.iby Thu Jan 07 12:55:39 2010 +0200
@@ -47,9 +47,8 @@
//Backup registration
data=DATAZ_\private\200159c0\backup_registration.xml private\200159c0\backup_registration.xml
-// Exporting of HSPS Test configurations:
-// Uncomment if _HSPS_AUTOINSTALL_TEST_THEMES_ defined
-// #include <hspsTestConfigurations.iby>
+//Cenrep ini
+data=DATAZ_\private\10202be9\200159c9.txt private\10202be9\200159c9.txt
#endif // HSPS_IBY
--- a/homescreenpluginsrv/rom/hspstestconfigurations.iby Thu Dec 17 08:54:17 2009 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/*
-* Copyright (c) 2008 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Test configurations for the internal HSPS Eunit tests
-*
-*/
-
-
-#ifndef HSPSTESTCONFIGURATIONS_IBY
-#define HSPSTESTCONFIGURATIONS_IBY
-
-
-// Configuration files
-
-// NOTE!!! This file should be in sync with the homescreenpluginservice\internal\testthemes\group\bld.inf file
-
-// ==============================================================================
-// MinimalConfiguration
-// ==============================================================================
-
-// MinimalConfiguration - Widget
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b102\1.0\manifest.dat private\200159c0\install\0998\101fb657\2000b102\1.0\manifest.dat
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b102\1.0\widgetconfiguration.xml private\200159c0\install\0998\101fb657\2000b102\1.0\widgetconfiguration.xml
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b102\1.0\0\locale.dtd private\200159c0\install\0998\101fb657\2000b102\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\install\plugin_0998_101fb657_2000b102_1.0.dat private\200159c0\install\plugin_0998_101fb657_2000b102_1.0.dat
-
-// minimalconfiguration - view
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b101\1.0\manifest.dat private\200159c0\install\0998\101fb657\2000b101\1.0\manifest.dat
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b101\1.0\viewconfiguration.xml private\200159c0\install\0998\101fb657\2000b101\1.0\viewconfiguration.xml
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b101\1.0\main.xml private\200159c0\install\0998\101fb657\2000b101\1.0\main.xml
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b101\1.0\picture.jpeg private\200159c0\install\0998\101fb657\2000b101\1.0\picture.jpeg
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b101\1.0\resource.file private\200159c0\install\0998\101fb657\2000b101\1.0\resource.file
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b101\1.0\viewnavigationrules.xml private\200159c0\install\0998\101fb657\2000b101\1.0\viewnavigationrules.xml
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b101\1.0\0\locale.dtd private\200159c0\install\0998\101fb657\2000b101\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\install\plugin_0998_101fb657_2000b101_1.0.dat private\200159c0\install\plugin_0998_101fb657_2000b101_1.0.dat
-
-// minimalconfiguration - root
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b100\1.0\manifest.dat private\200159c0\install\102750f0\101fb657\2000b100\1.0\manifest.dat
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b100\1.0\rootconfiguration.xml private\200159c0\install\102750f0\101fb657\2000b100\1.0\rootconfiguration.xml
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b100\1.0\0\locale.dtd private\200159c0\install\102750f0\101fb657\2000b100\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\install\app_102750f0_101fb657_2000b100_1.0.dat private\200159c0\install\app_102750f0_101fb657_2000b100_1.0.dat
-
-
-// ==============================================================================
-// typicalconfiguration
-// ==============================================================================
-
-// typicalconfiguration - widget
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b120\1.0\manifest.dat private\200159c0\install\0998\101fb657\2000b120\1.0\manifest.dat
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b120\1.0\widgetconfiguration.xml private\200159c0\install\0998\101fb657\2000b120\1.0\widgetconfiguration.xml
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b120\1.0\hs_logo.jpg private\200159c0\install\0998\101fb657\2000b120\1.0\hs_logo.jpg
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b120\1.0\widget.bmp private\200159c0\install\0998\101fb657\2000b120\1.0\widget.bmp
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b120\1.0\0\locale.dtd private\200159c0\install\0998\101fb657\2000b120\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b120\1.0\1\locale.dtd private\200159c0\install\0998\101fb657\2000b120\1.0\1\locale.dtd
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b120\1.0\9\locale.dtd private\200159c0\install\0998\101fb657\2000b120\1.0\9\locale.dtd
-data=DATAZ_\private\200159c0\install\plugin_0998_101fb657_2000b120_1.0.dat private\200159c0\install\plugin_0998_101fb657_2000b120_1.0.dat
-
-// typicalconfiguration - view1
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b111\1.0\manifest.dat private\200159c0\install\0998\101fb657\2000b111\1.0\manifest.dat
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b111\1.0\viewconfiguration.xml private\200159c0\install\0998\101fb657\2000b111\1.0\viewconfiguration.xml
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b111\1.0\view1.bmp private\200159c0\install\0998\101fb657\2000b111\1.0\view1.bmp
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b111\1.0\0\locale.dtd private\200159c0\install\0998\101fb657\2000b111\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b111\1.0\1\locale.dtd private\200159c0\install\0998\101fb657\2000b111\1.0\1\locale.dtd
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b111\1.0\9\locale.dtd private\200159c0\install\0998\101fb657\2000b111\1.0\9\locale.dtd
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b111\1.0\0\hs_logoz.jpg private\200159c0\install\0998\101fb657\2000b111\1.0\0\hs_logoz.jpg
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b111\1.0\1\hs_logoz.jpg private\200159c0\install\0998\101fb657\2000b111\1.0\1\hs_logoz.jpg
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b111\1.0\9\hs_logoz.jpg private\200159c0\install\0998\101fb657\2000b111\1.0\9\hs_logoz.jpg
-data=DATAZ_\private\200159c0\install\plugin_0998_101fb657_2000b111_1.0.dat private\200159c0\install\plugin_0998_101fb657_2000b111_1.0.dat
-
-// typicalconfiguration - view2
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b112\1.0\manifest.dat private\200159c0\install\0998\101fb657\2000b112\1.0\manifest.dat
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b112\1.0\viewconfiguration.xml private\200159c0\install\0998\101fb657\2000b112\1.0\viewconfiguration.xml
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b112\1.0\view2.bmp private\200159c0\install\0998\101fb657\2000b112\1.0\view2.bmp
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b112\1.0\0\locale.dtd private\200159c0\install\0998\101fb657\2000b112\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b112\1.0\1\locale.dtd private\200159c0\install\0998\101fb657\2000b112\1.0\1\locale.dtd
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b112\1.0\9\locale.dtd private\200159c0\install\0998\101fb657\2000b112\1.0\9\locale.dtd
-data=DATAZ_\private\200159c0\install\plugin_0998_101fb657_2000b112_1.0.dat private\200159c0\install\plugin_0998_101fb657_2000b112_1.0.dat
-
-// typicalconfiguration - root
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b110\1.0\manifest.dat private\200159c0\install\102750f0\101fb657\2000b110\1.0\manifest.dat
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b110\1.0\rootconfiguration.xml private\200159c0\install\102750f0\101fb657\2000b110\1.0\rootconfiguration.xml
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b110\1.0\root.bmp private\200159c0\install\102750f0\101fb657\2000b110\1.0\root.bmp
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b110\1.0\0\locale.dtd private\200159c0\install\102750f0\101fb657\2000b110\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b110\1.0\1\locale.dtd private\200159c0\install\102750f0\101fb657\2000b110\1.0\1\locale.dtd
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b110\1.0\9\locale.dtd private\200159c0\install\102750f0\101fb657\2000b110\1.0\9\locale.dtd
-data=DATAZ_\private\200159c0\install\app_102750f0_101fb657_2000b110_1.0.dat private\200159c0\install\app_102750f0_101fb657_2000b110_1.0.dat
-
-
-// ==============================================================================
-// operatorconfiguration
-// ==============================================================================
-
-// operatorconfiguration - view
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b131\1.0\manifest.dat private\200159c0\install\0998\101fb657\2000b131\1.0\manifest.dat
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b131\1.0\configuration.xml private\200159c0\install\0998\101fb657\2000b131\1.0\configuration.xml
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b131\1.0\0\locale.dtd private\200159c0\install\0998\101fb657\2000b131\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\install\plugin_0998_101fb657_2000b131_1.0.dat private\200159c0\install\plugin_0998_101fb657_2000b131_1.0.dat
-
-// operatorconfiguration - root
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b130\1.0\manifest.dat private\200159c0\install\102750f0\101fb657\2000b130\1.0\manifest.dat
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b130\1.0\configuration.xml private\200159c0\install\102750f0\101fb657\2000b130\1.0\configuration.xml
-data=DATAZ_\private\200159c0\install\102750f0\101fb657\2000b130\1.0\0\locale.dtd private\200159c0\install\102750f0\101fb657\2000b130\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\install\app_102750f0_101fb657_2000b130_1.0.dat private\200159c0\install\app_102750f0_101fb657_2000b130_1.0.dat
-
-
-// ==============================================================================
-// finnishwidget
-// ==============================================================================
-
-// finnishwidget - widget
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b132\1.0\manifest.dat private\200159c0\install\0998\101fb657\2000b132\1.0\manifest.dat
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b132\1.0\widgetconfiguration.xml private\200159c0\install\0998\101fb657\2000b132\1.0\widgetconfiguration.xml
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b132\1.0\common.jpg private\200159c0\install\0998\101fb657\2000b132\1.0\common.jpg
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b132\1.0\0\locale.dtd private\200159c0\install\0998\101fb657\2000b132\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b132\1.0\9\locale.dtd private\200159c0\install\0998\101fb657\2000b132\1.0\9\locale.dtd
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b132\1.0\0\localizedbg.jpg private\200159c0\install\0998\101fb657\2000b132\1.0\0\localizedbg.jpg
-data=DATAZ_\private\200159c0\install\0998\101fb657\2000b132\1.0\9\localizedbg.jpg private\200159c0\install\0998\101fb657\2000b132\1.0\9\localizedbg.jpg
-data=DATAZ_\private\200159c0\install\plugin_0998_101fb657_2000b132_1.0.dat private\200159c0\install\plugin_0998_101fb657_2000b132_1.0.dat
-
-
-
-// ==============================================================================
-// installedwidget
-// ==============================================================================
-
-// installedwidget
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\manifest.dat private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\manifest.dat
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\widgetconfiguration.xml private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\widgetconfiguration.xml
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\0\locale.dtd private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\0\locale.dtd
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\0\hs_logo.jpg private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\0\hs_logo.jpg
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\0\widget.bmp private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\0\widget.bmp
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\1\locale.dtd private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\1\locale.dtd
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\1\hs_logo.jpg private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\1\hs_logo.jpg
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\1\widget.bmp private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\1\widget.bmp
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\9\locale.dtd private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\9\locale.dtd
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\9\hs_logo.jpg private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\9\hs_logo.jpg
-data=DATAZ_\private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\9\widget.bmp private\200159c0\sisxtest\0998\101fb657\2000b133\1.0\9\widget.bmp
-data=DATAZ_\private\200159c0\sisxtest\plugin_0998_101fb657_2000b133_1.0.dat private\200159c0\sisxtest\plugin_0998_101fb657_2000b133_1.0.dat
-
-#endif // HSPSTESTCONFIGURATIONS_IBY
-
-// End of File
--- a/homescreensrv_plat/sapi_homescreenplugin/inc/hspscallback.h Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreensrv_plat/sapi_homescreenplugin/inc/hspscallback.h Thu Jan 07 12:55:39 2010 +0200
@@ -19,9 +19,9 @@
#ifndef __HSPSCALLBACK_H
#define __HSPSCALLBACK_H
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
#include "hspsconfigurationservice.h"
--- a/homescreensrv_plat/sapi_homescreenplugin/inc/hspsconfigurationif.h Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreensrv_plat/sapi_homescreenplugin/inc/hspsconfigurationif.h Thu Jan 07 12:55:39 2010 +0200
@@ -19,9 +19,9 @@
#ifndef C_CHSPSCONFIGURATIONIF_H
#define C_CHSPSCONFIGURATIONIF_H
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
-#include <LiwBufferExtension.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
+#include <liwbufferextension.h>
#include "hspsconfigurationservice.h"
#include "hspspersonalisationservice.h"
--- a/homescreensrv_plat/sapi_homescreenplugin/inc/hspsliwutilities.h Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreensrv_plat/sapi_homescreenplugin/inc/hspsliwutilities.h Thu Jan 07 12:55:39 2010 +0200
@@ -20,7 +20,7 @@
#define _HSPSLIWUTILITIES_H_
#include <e32base.h>
-#include <LiwCommon.h>
+#include <liwcommon.h>
#include <hspsdomdocument.h>
#include <hspsdomlist.h>
#include <hspsodt.h>
--- a/homescreensrv_plat/sapi_homescreenplugin/inc/hspsprovider.h Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreensrv_plat/sapi_homescreenplugin/inc/hspsprovider.h Thu Jan 07 12:55:39 2010 +0200
@@ -19,8 +19,8 @@
#ifndef C_CHSPSPROVIDER_H
#define C_CHSPSPROVIDER_H
-#include <LiwCommon.h>
-#include <LiwServiceIfBase.h>
+#include <liwcommon.h>
+#include <liwserviceifbase.h>
/**
* @ingroup group_hsps_sapi
--- a/homescreensrv_plat/sapi_homescreenplugin/tsrc/group/updatetests.cmd Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreensrv_plat/sapi_homescreenplugin/tsrc/group/updatetests.cmd Thu Jan 07 12:55:39 2010 +0200
@@ -2,7 +2,7 @@
@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
@rem All rights reserved.
@rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
+@rem under the terms of the License "Eclipse Public License v1.0"
@rem which accompanies this distribution, and is available
@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
@rem
--- a/homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/inc/mt_hsps_requestnotify_6.h Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreensrv_plat/sapi_homescreenplugin/tsrc/hspsconfigurationif/inc/mt_hsps_requestnotify_6.h Thu Jan 07 12:55:39 2010 +0200
@@ -2,7 +2,7 @@
* Copyright (c) 2008 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"
+* under the terms of the License "Eclipse Public License v1.0"
* which accompanies this distribution, and is available
* at the URL "http://www.eclipse.org/legal/epl-v10.html".
*
@@ -1199,7 +1199,7 @@
5,
1,0,0,0,
6,
-'6',
+'0',
// - pluginConf::plugins
// - Variant name
// - Version 1.0
--- a/homescreensrv_plat/sapi_menucontent/src/mcsservicehandler.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreensrv_plat/sapi_menucontent/src/mcsservicehandler.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -18,7 +18,7 @@
#include <ecom/implementationproxy.h>
-#include <LiwGenericParam.hrh>
+#include <liwgenericparam.hrh>
#include "mcsconstants.h"
#include "mcsdsinterface.h"
--- a/homescreensrv_plat/xcfw_api/inc/xcfwengine.h Thu Dec 17 08:54:17 2009 +0200
+++ b/homescreensrv_plat/xcfw_api/inc/xcfwengine.h Thu Jan 07 12:55:39 2010 +0200
@@ -22,7 +22,7 @@
// INCLUDES
#include <s32std.h>
-#include <gmxmlparser.h>
+#include <GMXMLParser.h>
#include <gmxmlcomposer.h>
#include "gecodefaultobjectfactory.h"
Binary file idlefw/conf/activeidle2.confml has changed
Binary file idlefw/conf/activeidle2_10275102.crml has changed
--- a/idlefw/plugins/mcsplugin/data/mcspluginsettingsres.rss Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/mcsplugin/data/mcspluginsettingsres.rss Thu Jan 07 12:55:39 2010 +0200
@@ -33,11 +33,11 @@
#include "mcspluginsettings.hrh"
-NAME MCSE
+NAME MCPS
RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf="MCSE"; }
+RESOURCE TBUF { buf="MCPS"; }
//----------------------------------------------------
// EIK_APP_INFO
--- a/idlefw/plugins/mcsplugin/publisher/inc/mcspluginengine.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/mcsplugin/publisher/inc/mcspluginengine.h Thu Jan 07 12:55:39 2010 +0200
@@ -23,8 +23,8 @@
#include <e32base.h>
#include <mcsmenu.h>
#include <mcsmenunotifier.h>
-#include <FavouritesDbObserver.h> // For MFavouritesDbObserver
-#include <FavouritesDb.h> // For RFavouritesDb
+#include <favouritesdbobserver.h> // For MFavouritesDbObserver
+#include <favouritesdb.h> // For RFavouritesDb
#include <msvapi.h> // For MMsvSessionObserver
#include "mcspluginwatcher.h"
--- a/idlefw/plugins/mcsplugin/publisher/src/mcsplugindata.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/mcsplugin/publisher/src/mcsplugindata.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -32,11 +32,8 @@
_LIT8( KProperNameUid, "uid" );
_LIT8( KProperNameView, "view" );
_LIT8( KProperValueFolder, "folder" );
-_LIT8( KProperValueSuite, "suite" );
_LIT8( KProperValueBookmark, "bookmark" );
_LIT8( KProperValueAppl, "application" );
-_LIT( KMCSPlugin, "MCSPlugin" );
-_LIT( KSuiteName, "suite_name" );
// ======== LOCAL FUNCTIONS ========
@@ -185,9 +182,8 @@
filter->DoNotHaveAttributeL( KMenuAttrView );
filter->DoNotHaveAttributeL( KMenuAttrParam );
TBool isFolder = EFalse;
- TBool isSuite = EFalse;
- // first, we need to check if the item is folder or suite
+ // first, we need to check if the item is folder
for ( TInt i = 0; i < aProperties.Count(); i++ )
{
if ( aProperties[i]->Name() == KProperNameType )
@@ -196,12 +192,6 @@
{
isFolder = ETrue;
}
-
- if ( aProperties[i]->Value() == KProperValueSuite )
- {
- isSuite = ETrue;
- }
-
break;
}
}
@@ -225,38 +215,17 @@
if ( value->Length() != 0 )
{
- // in case of folder/suite, we just have to extract
+ // in case of folder, we just have to extract
// id from param attribute and return item with this id
- if ( aProperties[i]->Name() == KProperNameParam && ( isFolder || isSuite ) )
+ if ( aProperties[i]->Name() == KProperNameParam && isFolder )
{
-
TMenuItem item;
-
- // set the type
- if ( isFolder )
- {
- // convert id to integer
- TInt id;
- TLex16 lextmp( value->Ptr() );
- lextmp.Val( id );
- item.SetType( KMenuTypeFolder );
- item.SetId( id );
- }
-
- if ( isSuite )
- {
- CMenuFilter* suitefilter = CMenuFilter::NewLC();
- // Exclude 'view' and 'param' attributes from search criteria by default
- // Criterias will be added to filter if setting defines them
- suitefilter->DoNotHaveAttributeL( KMenuAttrView );
- suitefilter->DoNotHaveAttributeL( KMenuAttrParam );
- suitefilter->HaveAttributeL( KSuiteName, *value );
- // locked property excluded from search pattern
- suitefilter->DoNotHaveAttributeL( KMenuAttrLocked );
- item = iEngine.FindMenuItemL( *suitefilter );
- CleanupStack::PopAndDestroy( suitefilter );
-
- }
+ // convert id to integer
+ TInt id;
+ TLex16 lextmp( value->Ptr() );
+ lextmp.Val( id );
+ item.SetType( KMenuTypeFolder );
+ item.SetId( id );
CleanupStack::PopAndDestroy( value );
CleanupStack::PopAndDestroy( name );
--- a/idlefw/plugins/mcsplugin/publisher/src/mcspluginengine.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/mcsplugin/publisher/src/mcspluginengine.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -28,8 +28,8 @@
#include <mcsmenufilter.h>
#include <mcsmenuoperation.h>
#include <mcsmenuiconutility.h>
-#include <ActiveFavouritesDbNotifier.h>
-#include <FavouritesItemList.h>
+#include <activefavouritesdbnotifier.h>
+#include <favouritesitemlist.h>
#include <bautils.h>
#include <StringLoader.h>
@@ -55,11 +55,9 @@
_LIT( KResPath, "\\resource\\" );
_LIT( KMenuAttrRefcount, "ref_count" );
_LIT( KMMApplication, "mm://" );
-_LIT( KHideExit, "?exit=hide" );
_LIT( KHideExit2, "&exit=hide" );
_LIT( KSetFocusString, "!setfocus?applicationgroup_name=" );
_LIT( KApplicationGroupName, "applicationgroup_name" );
-_LIT( KSuiteName, "suite_name" );
_LIT( KIcon, "icon" );
_LIT( KMenuAttrUndefUid, "0x99999991" );
@@ -334,52 +332,31 @@
CleanupStack::PushL( item );
TPtrC type = item->Type();
- // run suite/folder
- if ( type == KMenuTypeSuite || type == KMenuTypeFolder )
+ // run folder
+ if ( type == KMenuTypeFolder )
{
// message for MM application
HBufC8* message;
- if ( type == KMenuTypeSuite )
- {
- // prepare message for launching suite
- TBool hasSuiteName = EFalse;
- TPtrC suiteName = item->GetAttributeL( KSuiteName, hasSuiteName );
- if ( !hasSuiteName )
- {
- CleanupStack::PopAndDestroy( item );
- return;
- }
- message = HBufC8::NewLC( KMMApplication().Length() +
- suiteName.Length() +
- KHideExit().Length() );
-
- message->Des().Copy( KMMApplication );
- message->Des().Append( suiteName );
- message->Des().Append( KHideExit );
- }
- else
+ // prepare message for launching folder
+ TBool hasApplicationGroupName = EFalse;
+ TPtrC applicationGroupName = item->GetAttributeL( KApplicationGroupName,
+ hasApplicationGroupName );
+ if ( !hasApplicationGroupName )
{
- // prepare message for launching folder
- TBool hasApplicationGroupName = EFalse;
- TPtrC applicationGroupName = item->GetAttributeL( KApplicationGroupName,
- hasApplicationGroupName );
- if ( !hasApplicationGroupName )
- {
- CleanupStack::PopAndDestroy( item );
- return;
- }
- message = HBufC8::NewLC( KMMApplication().Length() +
- KSetFocusString().Length() +
- applicationGroupName.Length() +
- KHideExit2().Length() );
+ CleanupStack::PopAndDestroy( item );
+ return;
+ }
+ message = HBufC8::NewLC( KMMApplication().Length() +
+ KSetFocusString().Length() +
+ applicationGroupName.Length() +
+ KHideExit2().Length() );
- message->Des().Copy( KMMApplication );
- message->Des().Append( KSetFocusString );
- message->Des().Append( applicationGroupName );
- message->Des().Append( KHideExit2 );
- }
+ message->Des().Copy( KMMApplication );
+ message->Des().Append( KSetFocusString );
+ message->Des().Append( applicationGroupName );
+ message->Des().Append( KHideExit2 );
// find MM application
TApaTaskList taskList( CCoeEnv::Static()->WsSession() );
--- a/idlefw/plugins/mcsplugin/settings/inc/mcspluginsettingsbkmlist.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/mcsplugin/settings/inc/mcspluginsettingsbkmlist.h Thu Jan 07 12:55:39 2010 +0200
@@ -21,9 +21,9 @@
#include <e32base.h>
#include <bamdesca.h> // For MDesCArray
-#include <FavouritesDbObserver.h> // For MFavouritesDbObserver
-#include <FavouritesDb.h> // For RFavouritesDb
-#include <FavouritesItemList.h> // For CFavouritesItemList
+#include <favouritesdbobserver.h> // For MFavouritesDbObserver
+#include <favouritesdb.h> // For RFavouritesDb
+#include <favouritesitemlist.h> // For CFavouritesItemList
#include <mcsmenu.h> // For MenuContentService
class CActiveFavouritesDbNotifier;
--- a/idlefw/plugins/mcsplugin/settings/inc/mcspluginsettingscontainer.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/mcsplugin/settings/inc/mcspluginsettingscontainer.h Thu Jan 07 12:55:39 2010 +0200
@@ -23,8 +23,8 @@
#include <gsbasecontainer.h>
#include <mcsmenu.h>
#include <mcsmenunotifier.h>
-#include <FavouritesDbObserver.h> // For MFavouritesDbObserver
-#include <FavouritesDb.h> // For RFavouritesDb
+#include <favouritesdbobserver.h> // For MFavouritesDbObserver
+#include <favouritesdb.h> // For RFavouritesDb
#include <msvapi.h> // For MMsvSessionObserver
// Internal includes
--- a/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsapplist.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsapplist.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -41,12 +41,8 @@
_LIT( KMailboxUid, "0x100058c5" );
_LIT( KInitialRefCount, "1" );
_LIT( KMCSFolder, "mcsplugin_folder" );
-_LIT( KSuiteName, "suite_name" );
_LIT8( KItemLocked, "locked");
_LIT8( KProperValueFolder, "folder" );
-_LIT8( KProperValueSuite, "suite" );
-
-
// ======== MEMBER FUNCTIONS ========
@@ -169,9 +165,8 @@
TBool attrExists( EFalse );
TSettingItem settingItem = { KErrNotFound, EApplication, EFalse };
TBool isFolder = EFalse;
- TBool isSuite = EFalse;
- // check if the item is folder or suite
+ // check if the item is folder
for ( TInt j = 0; j < aProperties.Count(); j++ )
{
if( aProperties[j]->Name() == KType )
@@ -181,11 +176,6 @@
{
isFolder = ETrue;
}
-
- if ( aProperties[j]->Value() == KProperValueSuite )
- {
- isSuite = ETrue;
- }
break;
}
}
@@ -233,22 +223,6 @@
break;
}
- // in case of suite, we just have to compare suite_name
- // which is stored in param attribute
- if ( isSuite && *attrName == KMenuAttrParameter )
- {
- TBool exists;
- TPtrC suitename = item->GetAttributeL( KSuiteName, exists );
-
- if ( !exists || suitename != *attrValue )
- {
- match = EFalse;
- }
- CleanupStack::PopAndDestroy( attrValue );
- CleanupStack::PopAndDestroy( attrName );
- break;
- }
-
// otherwise, compare attributes from HSPS and from menuitem
// if there is no match, move to the next item in the list
if ( attr != *attrValue )
@@ -391,9 +365,9 @@
{
TPtrC type = itemArray[ i ].Type();
- // we add applications, shortcuts, folders and suites to the list
+ // we add applications, shortcuts and folders to the list
if ( type == KMenuTypeApp || type == KMenuTypeShortcut ||
- type == KMenuTypeFolder || type == KMenuTypeSuite )
+ type == KMenuTypeFolder )
{
CMenuItem* menuItem = CMenuItem::OpenL( iMenu, itemArray[ i ] );
CleanupStack::PushL( menuItem );
--- a/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsbkmlist.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsbkmlist.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -17,7 +17,7 @@
#include <StringLoader.h>
-#include <ActiveFavouritesDbNotifier.h> // For CActiveFavouritesDbNotifier
+#include <activefavouritesdbnotifier.h> // For CActiveFavouritesDbNotifier
#include <aistrcnv.h>
#include <mcsmenufilter.h>
#include <mcsmenuitem.h>
--- a/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingscontainer.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingscontainer.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -29,7 +29,7 @@
#include <hlplch.h>
// For CActiveFavouritesDbNotifier
-#include <ActiveFavouritesDbNotifier.h>
+#include <activefavouritesdbnotifier.h>
#include <mcspluginsettingsres.rsg>
#include "mcspluginsettingscontainer.h"
--- a/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsmodel.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/mcsplugin/settings/src/mcspluginsettingsmodel.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -51,7 +51,7 @@
_LIT8( KProperValueSuite, "suite" );
_LIT8( KProperValueBookmark, "bookmark" );
_LIT8( KProperValueAppl, "application" );
-_LIT( KSuiteName, "suite_name" );
+
using namespace HSPluginSettingsIf;
@@ -345,7 +345,6 @@
{
TPtrC param = aMenuItem.GetAttributeL( KMenuAttrParam, exists );
TBool isFolder = EFalse;
- TBool isSuite = EFalse;
TPtrC type = aMenuItem.Type();
// is the item folder or suite?
@@ -355,12 +354,7 @@
isFolder = ETrue;
}
- if ( type == KMenuTypeSuite )
- {
- isSuite = ETrue;
- }
-
- if ( exists || isFolder || isSuite )
+ if ( exists || isFolder )
{
// the folder id is stored
// in param attribute in HSPS
@@ -371,18 +365,6 @@
param.Set( number );
}
- // the suite_name is stored
- // in param attribute in HSPS
- if ( isSuite )
- {
- TBool suiteNameExists = EFalse;
- TPtrC suiteName = aMenuItem.GetAttributeL( KSuiteName, suiteNameExists );
- if ( suiteNameExists )
- {
- param.Set( suiteName );
- }
- }
-
HBufC8* param8( NULL );
param8 = AiUtility::CopyToBufferL( param8, param );
CleanupStack::PushL( param8 );
--- a/idlefw/plugins/sapidataplugin/inc/sapidata.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/sapidataplugin/inc/sapidata.h Thu Jan 07 12:55:39 2010 +0200
@@ -20,7 +20,7 @@
#define SAPIDATA_H
// INCLUDE FILES
-#include <LiwCommon.h>
+#include <liwcommon.h>
#include <AknsItemID.h>
#include <aieventhandlerextension.h>
#include "sapidatapluginconst.h"
--- a/idlefw/plugins/sapidataplugin/inc/sapidataobserver.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/sapidataplugin/inc/sapidataobserver.h Thu Jan 07 12:55:39 2010 +0200
@@ -20,7 +20,7 @@
#define SAPIDATAOBSERVER_H
// INCLUDE FILES
-#include <LiwCommon.h>
+#include <liwcommon.h>
class CSapiData;
--- a/idlefw/plugins/sapidataplugin/inc/sapidataplugin.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/sapidataplugin/inc/sapidataplugin.h Thu Jan 07 12:55:39 2010 +0200
@@ -387,6 +387,9 @@
// Is Homescreen foreground.
TBool iHSForeGround;
+
+ // Is KeyLockON.
+ TBool iKeyLockOn;
// Plugin state
TPluginStates iPluginState;
--- a/idlefw/plugins/sapidataplugin/src/sapidata.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/sapidataplugin/src/sapidata.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -16,7 +16,7 @@
*/
#include <ecom/ecom.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
#include <aipluginsettings.h>
#include <utf.h>
--- a/idlefw/plugins/sapidataplugin/src/sapidataobserver.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/sapidataplugin/src/sapidataobserver.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -16,9 +16,9 @@
*/
-#include <LiwServiceHandler.h>
-#include <LiwVariant.h>
-#include <LiwGenericParam.h>
+#include <liwservicehandler.h>
+#include <liwvariant.h>
+#include <liwgenericparam.h>
#include "sapidata.h"
#include "sapidataobserver.h"
#include "sapidatapluginconst.h"
--- a/idlefw/plugins/sapidataplugin/src/sapidataplugin.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/sapidataplugin/src/sapidataplugin.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -87,6 +87,7 @@
iInfo.iUid.iUid = SAPIDP_UID_ECOM_IMPLEMENTATION_CONTENTPUBLISHER_DATAPLUGIN;
iPluginState = ENone;
iHSForeGround = EFalse;
+ iKeyLockOn = EFalse;
iNetworkStatus = EUnknown;
iData = CSapiData::NewL(this);
@@ -211,7 +212,6 @@
//
void CSapiDataPlugin::PublishL()
{
- TInt err( KErrNone );
User::LeaveIfError( iRfs.Connect() );
TInt observers( iObservers.Count() );
@@ -443,7 +443,6 @@
//
void CSapiDataPlugin::RefreshL(TDesC& aContentType, TDesC& aOperation)
{
- TInt err( KErrNone );
User::LeaveIfError( iRfs.Connect() );
TInt observers( iObservers.Count() );
TInt transactionId = reinterpret_cast<TInt>( this );
@@ -522,6 +521,7 @@
case EAiKeylockEnabled:
{
// handled in resume
+ TRAP_IGNORE( DoResumeL( aReason ) );
break;
}
default :
@@ -686,7 +686,7 @@
}
case EAiBacklightOn:
{
- if ( iPluginState == ESuspend )
+ if ( iPluginState == ESuspend && !iKeyLockOn )
{
iPluginState = EResume;
iData->ResumeL();
@@ -695,6 +695,7 @@
}
case EAiKeylockDisabled:
{
+ iKeyLockOn = EFalse;
// Key lock events considered only if HS is in foreground
if ( iHSForeGround && iPluginState == ESuspend )
{
@@ -705,6 +706,7 @@
}
case EAiKeylockEnabled:
{
+ iKeyLockOn = ETrue;
// Key lock events considered only if HS is in foreground
if ( iHSForeGround && iPluginState == EResume )
{
--- a/idlefw/plugins/shortcutplugin/inc/caiscutengine.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/shortcutplugin/inc/caiscutengine.h Thu Jan 07 12:55:39 2010 +0200
@@ -21,11 +21,11 @@
#include <apgnotif.h> // For MApaAppListServObserver
#include <msvapi.h> // For MMsvSessionObserver
-#include <FavouritesDb.h> // For RFavouritesDb
-#include <FavouritesDbObserver.h> // For MFavouritesDbObserver
+#include <favouritesdb.h> // For RFavouritesDb
+#include <favouritesdbobserver.h> // For MFavouritesDbObserver
#include <ConeResLoader.h>
#ifdef __WEB_WIDGETS
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
#endif
#include <aiutility.h>
--- a/idlefw/plugins/shortcutplugin/inc/caiscutsettingsbkmlist.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/shortcutplugin/inc/caiscutsettingsbkmlist.h Thu Jan 07 12:55:39 2010 +0200
@@ -21,7 +21,7 @@
#include <e32base.h>
#include <bamdesca.h> // For MDesCArray
-#include <FavouritesDbObserver.h> // For MFavouritesDbObserver
+#include <favouritesdbobserver.h> // For MFavouritesDbObserver
class CCoeEnv;
class CActiveFavouritesDbNotifier;
--- a/idlefw/plugins/shortcutplugin/inc/caiscutsettingsmodel.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/shortcutplugin/inc/caiscutsettingsmodel.h Thu Jan 07 12:55:39 2010 +0200
@@ -22,8 +22,8 @@
#include <e32base.h>
#include <bamdesca.h> // For MDesCArray
#include <apgcli.h> // For RApaLsSession
-#include <FavouritesDb.h> // For RFavouritesDb
-#include <FavouritesItemList.h> // For CFavouritesItemList
+#include <favouritesdb.h> // For RFavouritesDb
+#include <favouritesitemlist.h> // For CFavouritesItemList
#include "caiscutsettingsapplist.h"
#include "caiscutsettingsbkmlist.h"
--- a/idlefw/plugins/shortcutplugin/src/caiscutengine.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/shortcutplugin/src/caiscutengine.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -26,7 +26,7 @@
#include <utf.h> // For CnvUtfConverter
#include <bautils.h>
#include <featmgr.h>
-#include <ActiveFavouritesDbNotifier.h> // For CActiveFavouritesDbNotifier
+#include <activefavouritesdbnotifier.h> // For CActiveFavouritesDbNotifier
#include <pathinfo.h>
#include <data_caging_path_literals.hrh>
#include <AknSgcc.h> // for fast swap
--- a/idlefw/plugins/shortcutplugin/src/caiscutsettingsbkmlist.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/shortcutplugin/src/caiscutsettingsbkmlist.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -17,7 +17,7 @@
#include <StringLoader.h>
-#include <ActiveFavouritesDbNotifier.h> // For CActiveFavouritesDbNotifier
+#include <activefavouritesdbnotifier.h> // For CActiveFavouritesDbNotifier
#include <aiscutsettingsres.rsg>
#include <aiscuttexts.rsg>
--- a/idlefw/plugins/shortcutplugin/src/caiscuttargetnewmsg.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/shortcutplugin/src/caiscuttargetnewmsg.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -17,7 +17,7 @@
#include <sendui.h> // For CSendUi
-#include <sendnorm.rsg> // For settings not ok - error dialog
+#include <Sendnorm.rsg> // For settings not ok - error dialog
#include <gulicon.h> // For CGulIcon
#include <SenduiMtmUids.h>
#include <cemailaccounts.h> // For finding out available email account counts
--- a/idlefw/plugins/wrtdataplugin/inc/wrtdata.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/wrtdataplugin/inc/wrtdata.h Thu Jan 07 12:55:39 2010 +0200
@@ -20,7 +20,7 @@
#define WRTDATA_H
// INCLUDE FILES
-#include <LiwCommon.h>
+#include <liwcommon.h>
#include <AknsItemID.h>
#include "wrtdatapluginconst.h"
#include "aicontentpublisher.h"
--- a/idlefw/plugins/wrtdataplugin/inc/wrtdataobserver.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/wrtdataplugin/inc/wrtdataobserver.h Thu Jan 07 12:55:39 2010 +0200
@@ -20,7 +20,7 @@
#define WRTDATAOBSERVER_H
// INCLUDE FILES
-#include <LiwCommon.h>
+#include <liwcommon.h>
class CWrtData;
--- a/idlefw/plugins/wrtdataplugin/inc/wrtdataplugin.h Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/wrtdataplugin/inc/wrtdataplugin.h Thu Jan 07 12:55:39 2010 +0200
@@ -392,6 +392,9 @@
// Is Homescreen foreground.
TBool iHSForeGround;
+
+ // Is KeyLockON.
+ TBool iKeyLockOn;
// Plugin state
TPluginStates iPluginState;
--- a/idlefw/plugins/wrtdataplugin/src/wrtdata.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/wrtdataplugin/src/wrtdata.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -17,7 +17,7 @@
*/
#include <ecom/ecom.h>
-#include <LiwServiceHandler.h>
+#include <liwservicehandler.h>
#include <aipluginsettings.h>
@@ -198,8 +198,6 @@
{
if(iInterface)
{
- TInt confindex( 0 );
-
CLiwDefaultMap *outDataMap = CLiwDefaultMap::NewLC();
CLiwDefaultMap* filter = CreateFilterLC( );
//append filter to input param
@@ -293,7 +291,6 @@
CLiwDefaultMap* filter = CreateFilterLC();
ExecuteCommandL( filter, outDataMap, KCpData );
CleanupStack::PopAndDestroy( filter );
- TInt id = KErrNotFound;
TLiwVariant variant;
if ( outDataMap->FindL( KImage1, variant ) )
{
@@ -400,8 +397,7 @@
CLiwGenericParamList* inParamList = &iServiceHandler->InParamListL();
CLiwGenericParamList* outParamList = &iServiceHandler->OutParamListL();
CLiwDefaultMap* filter = NULL;
- TInt confindex (0);
-
+
triggerName->Des().Copy(aTrigger);
if ( aObjectId == KPubData )
{
--- a/idlefw/plugins/wrtdataplugin/src/wrtdataobserver.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/wrtdataplugin/src/wrtdataobserver.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -16,9 +16,9 @@
*
*/
-#include <LiwServiceHandler.h>
-#include <LiwVariant.h>
-#include <LiwGenericParam.h>
+#include <liwservicehandler.h>
+#include <liwvariant.h>
+#include <liwgenericparam.h>
#include "wrtdata.h"
#include "wrtdataobserver.h"
#include "wrtdatapluginconst.h"
--- a/idlefw/plugins/wrtdataplugin/src/wrtdataplugin.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/idlefw/plugins/wrtdataplugin/src/wrtdataplugin.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -87,6 +87,7 @@
iInfo.iUid.iUid = WRTDP_UID_ECOM_IMPLEMENTATION_CONTENTPUBLISHER_DATAPLUGIN;
iPluginState = ENone;
iHSForeGround = EFalse;
+ iKeyLockOn = EFalse;
iNetworkStatus = EUnknown;
iData = CWrtData::NewL(this);
@@ -129,7 +130,6 @@
//
void CWrtDataPlugin::PublishL()
{
- TInt err( KErrNone );
User::LeaveIfError( iRfs.Connect() );
TInt observers( iObservers.Count() );
@@ -365,7 +365,6 @@
//
void CWrtDataPlugin::RefreshL(TDesC16& aOperation)
{
- TInt err( KErrNone );
User::LeaveIfError( iRfs.Connect() );
TInt observers( iObservers.Count() );
TInt transactionId = reinterpret_cast<TInt>( this );
@@ -703,7 +702,7 @@
}
case EAiBacklightOn:
{
- if ( iPluginState == ESuspend )
+ if ( iPluginState == ESuspend && !iKeyLockOn )
{
iPluginState = EResume;
iData->ResumeL();
@@ -712,6 +711,7 @@
}
case EAiKeylockDisabled:
{
+ iKeyLockOn = EFalse;
// Key lock events considered only if HS is in foreground
if ( iHSForeGround && iPluginState == ESuspend )
{
@@ -722,6 +722,7 @@
}
case EAiKeylockEnabled:
{
+ iKeyLockOn = ETrue;
// Key lock events considered only if HS is in foreground
if ( iHSForeGround && iPluginState == EResume )
{
--- a/menucontentsrv/handlersrc/menuuninstalloperation.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/menucontentsrv/handlersrc/menuuninstalloperation.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -17,7 +17,7 @@
#include <apgcli.h>
#include <swi/sisregistrysession.h>
#include <swi/sisregistryentry.h>
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
#include <javaregistry.h>
#include <javaregistrypackageentry.h>
#include <javaregistryapplicationentry.h>
@@ -379,7 +379,7 @@
iUninstaller.CancelAsyncRequest( SwiUI::ERequestUninstall );
// Complete the caller:
TRequestStatus* status = &iObserverStatus;
- User::RequestComplete( status, iStatus.Int() );
+ User::RequestComplete( status, KErrCancel );
}
// ---------------------------------------------------------
--- a/menucontentsrv/handlersrc/menuurlhandler.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/menucontentsrv/handlersrc/menuurlhandler.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -24,7 +24,7 @@
#include <apgtask.h>
#include <apgcli.h>
#include <AknTaskList.h>
-#include <SchemeHandler.h>
+#include <schemehandler.h>
// ================= MEMBER FUNCTIONS =======================
--- a/menucontentsrv/src/menuclientoperation.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/menucontentsrv/src/menuclientoperation.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -236,5 +236,5 @@
iOperation.Cancel();
// Propagate completion to observer.
TRequestStatus* status = &iObserverStatus;
- User::RequestComplete( status, iStatus.Int() );
+ User::RequestComplete( status, KErrCancel );
}
--- a/menucontentsrv/srvinc/mcsrunningappswgmonitor.h Thu Dec 17 08:54:17 2009 +0200
+++ b/menucontentsrv/srvinc/mcsrunningappswgmonitor.h Thu Jan 07 12:55:39 2010 +0200
@@ -21,7 +21,7 @@
#define __MCSRUNNINGAPPSWGMONITOR_H__
#include <w32std.h>
-#include <WidgetRegistryConstants.h>
+#include <widgetregistryconstants.h>
#include "menuengoperation.h"
--- a/menucontentsrv/srvinc/menusrvengutils.h Thu Dec 17 08:54:17 2009 +0200
+++ b/menucontentsrv/srvinc/menusrvengutils.h Thu Jan 07 12:55:39 2010 +0200
@@ -23,7 +23,7 @@
#include <e32base.h>
#include <w32std.h>
#include <apgcli.h>
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
#include "menuengobject.h"
#include "menueng.h"
#include "menuengfilter.h"
--- a/menucontentsrv/srvsrc/mcsrunningappswgmonitor.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/menucontentsrv/srvsrc/mcsrunningappswgmonitor.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -17,7 +17,7 @@
#include <apgwgnam.h>
#include <apgtask.h>
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
#include <mmf/common/mmfcontrollerpluginresolver.h>
#include "mcsrunningappswgmonitor.h"
--- a/menucontentsrv/srvsrc/menusrvappscanner.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/menucontentsrv/srvsrc/menusrvappscanner.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -16,7 +16,7 @@
*/
#include <mcsmenuutils.h>
#include <e32property.h>
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
#include "menusrvappscanner.h"
#include "menusrvmmchistory.h"
#include "menueng.h"
--- a/menucontentsrv/srvsrc/menusrvengutils.cpp Thu Dec 17 08:54:17 2009 +0200
+++ b/menucontentsrv/srvsrc/menusrvengutils.cpp Thu Jan 07 12:55:39 2010 +0200
@@ -24,7 +24,7 @@
#include <SATDomainPSKeys.h>
#include <AknTaskList.h>
#include <mmf/common/mmfcontrollerpluginresolver.h>
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
#include "menusrvengutils.h"