--- a/cpsecplugins/devicelockplugin/src/cpdevicelockplugin.cpp Fri Jul 30 13:42:45 2010 +0300
+++ b/cpsecplugins/devicelockplugin/src/cpdevicelockplugin.cpp Fri Aug 06 10:55:57 2010 +0300
@@ -58,8 +58,14 @@
QList<CpSettingFormItemData*> CpDeviceLockPlugin::createSettingFormItemData(CpItemDataHelper &itemDataHelper) const
{
RDEBUG("0", 0);
+ RDEBUG("using icon", 1);
return QList<CpSettingFormItemData*>()
- << new CpSettingFormEntryItemDataImpl<CpDeviceLockPluginView>(itemDataHelper,tr("Device lock"), QString());
+ << new CpSettingFormEntryItemDataImpl<CpDeviceLockPluginView>(
+ itemDataHelper,
+ tr("Device lock"), // text
+ QString(), // description
+ HbIcon(QString("qtg_large_device_lock")) // icon
+ );
}
Q_EXPORT_PLUGIN2(cpdevicelockplugin, CpDeviceLockPlugin);
--- a/cpsecplugins/simpincodeplugin/src/cppincodeplugin.cpp Fri Jul 30 13:42:45 2010 +0300
+++ b/cpsecplugins/simpincodeplugin/src/cppincodeplugin.cpp Fri Aug 06 10:55:57 2010 +0300
@@ -54,9 +54,10 @@
CpItemDataHelper &itemDataHelper) const
{
RDEBUG("0", 0);
+ RDEBUG("using icon", 1);
return QList<CpSettingFormItemData *>()
<< new CpSettingFormEntryItemDataImpl<CpPinCodePluginView>
- (itemDataHelper, tr("PIN code"), QString());
+ (itemDataHelper, tr("PIN code"), QString(), HbIcon(QString("qtg_large_pin_code")) );
}
/*!
--- a/gba/gbaapi/group/gba.mmp Fri Jul 30 13:42:45 2010 +0300
+++ b/gba/gbaapi/group/gba.mmp Fri Aug 06 10:55:57 2010 +0300
@@ -23,8 +23,6 @@
VENDORID VID_DEFAULT
CAPABILITY CAP_CLIENT_DLL
-SMPSAFE
-
USERINCLUDE ../inc
USERINCLUDE ../../inc
--- a/gba/gbafilter/group/httpfiltergba.mmp Fri Jul 30 13:42:45 2010 +0300
+++ b/gba/gbafilter/group/httpfiltergba.mmp Fri Aug 06 10:55:57 2010 +0300
@@ -26,8 +26,6 @@
UID 0x10009D8D 0x20029F09
VENDORID VID_DEFAULT
-SMPSAFE
-
SOURCEPATH ../src
SOURCE HTTPFilterGBAMain.cpp HTTPFilterGBA.cpp
--- a/gba/gbaserver/group/gbaserver.mmp Fri Jul 30 13:42:45 2010 +0300
+++ b/gba/gbaserver/group/gbaserver.mmp Fri Aug 06 10:55:57 2010 +0300
@@ -24,8 +24,6 @@
VENDORID VID_DEFAULT
CAPABILITY CAP_SERVER NetworkControl
-SMPSAFE
-
USERINCLUDE ../inc
USERINCLUDE ../../inc
--- a/gba/uicc/group/gbauicc.mmp Fri Jul 30 13:42:45 2010 +0300
+++ b/gba/uicc/group/gbauicc.mmp Fri Aug 06 10:55:57 2010 +0300
@@ -25,8 +25,6 @@
CAPABILITY CAP_ECOM_PLUGIN
-SMPSAFE
-
USERINCLUDE ../inc
USERINCLUDE ../../inc
--- a/pkiutilities/CTSecurityDialogs/Group/CTSecDialogImpl.mmp Fri Jul 30 13:42:45 2010 +0300
+++ b/pkiutilities/CTSecurityDialogs/Group/CTSecDialogImpl.mmp Fri Aug 06 10:55:57 2010 +0300
@@ -97,7 +97,7 @@
DEBUGLIBRARY flogger.lib
-#if defined(ARMCC)
+#if defined( EABI )
DEFFILE ../eabi/CTSecDilogImpl.DEF
#elif defined( WINSCW )
DEFFILE ../BWINSCW/CTSecDilogImpl.DEF
--- a/pkiutilities/PKCS12/CrPkcs12/group/crpkcs12.mmp Fri Jul 30 13:42:45 2010 +0300
+++ b/pkiutilities/PKCS12/CrPkcs12/group/crpkcs12.mmp Fri Aug 06 10:55:57 2010 +0300
@@ -42,7 +42,7 @@
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
-#if defined(ARMCC)
+#if defined( EABI )
deffile ../eabi/
#else
deffile ../bwinscw/
--- a/pkiutilities/x509certnameparser/group/X509CertNameParser.mmp Fri Jul 30 13:42:45 2010 +0300
+++ b/pkiutilities/x509certnameparser/group/X509CertNameParser.mmp Fri Aug 06 10:55:57 2010 +0300
@@ -39,7 +39,7 @@
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
-#if defined(ARMCC)
+#if defined( EABI )
deffile ../EABI/
#elif defined( WINSCW )
deffile ../BWINSCW/
--- a/securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp Fri Jul 30 13:42:45 2010 +0300
+++ b/securitydialogs/SecUi/Src/SecUiSecurityHandler.cpp Fri Aug 06 10:55:57 2010 +0300
@@ -1043,6 +1043,7 @@
RMobilePhone::TMobilePassword iSecUi_password;
TInt lCancelSupported = ESecUiCancelNotSupported;
+ TInt lEmergencySupported = ESecUiEmergencyNotSupported;
TInt queryAccepted = KErrCancel;
TInt lAlphaSupported = 0;
RMobilePhone::TMobilePassword required_fourth;
@@ -1076,10 +1077,12 @@
{
RDEBUG("0", 0);
lCancelSupported = ESecUiCancelNotSupported;
+ lEmergencySupported = ESecUiEmergencySupported;
}
else
{
lCancelSupported = ESecUiCancelSupported;
+ lEmergencySupported = ESecUiEmergencyNotSupported;
// it will be RMobilePhone::ESecurityCodePin1 , equivalent to ESecUiNone
}
wait->SetRequestType(EMobilePhoneGetSecurityCodeInfo);
@@ -1115,7 +1118,7 @@
CleanupStack::PopAndDestroy(stringHolder);
title.Append(_L("$"));
title.AppendNum(codeInfo.iRemainingEntryAttempts);
- TInt amode = ESecUiSecretSupported | lAlphaSupported | lCancelSupported | ESecUiEmergencySupported | secCodeType;
+ TInt amode = ESecUiSecretSupported | lAlphaSupported | lCancelSupported | lEmergencySupported | secCodeType;
RDEBUG("amode", amode);
queryAccepted = iSecQueryUi->SecQueryDialog(title, iSecUi_password, SEC_C_PIN_CODE_MIN_LENGTH, SEC_C_PIN_CODE_MAX_LENGTH, amode);
RDEBUG("iSecUi_password", 0);
--- a/securitydialogs/secuinotifications/secuinotificationdialogplugin/src/secuinotificationcontentwidget.cpp Fri Jul 30 13:42:45 2010 +0300
+++ b/securitydialogs/secuinotifications/secuinotificationdialogplugin/src/secuinotificationcontentwidget.cpp Fri Aug 06 10:55:57 2010 +0300
@@ -309,7 +309,8 @@
mainLayout->addItem(mainLayoutButtons);
- codeTop->setFocus(); // this should open the VKB
+ // remove setFocus from PIN query because Orbit can't handle it
+ // codeTop->setFocus(); // this should open the VKB
}
--- a/securitydialogs/secuinotifications/secuinotificationdialogplugin/src/secuinotificationdialog.cpp Fri Jul 30 13:42:45 2010 +0300
+++ b/securitydialogs/secuinotifications/secuinotificationdialogplugin/src/secuinotificationdialog.cpp Fri Aug 06 10:55:57 2010 +0300
@@ -227,7 +227,8 @@
handleCodeTopChanged(codeTop->text());
}
RDEBUG("setFocus", 0);
- codeTop->setFocus(); // this should open the VKB . Doesn't seem to work when it's done on the widget, so it's done here.
+ // remove setFocus from PIN query because Orbit can't handle it
+ // codeTop->setFocus(); // this should open the VKB . Doesn't seem to work when it's done on the widget, so it's done here.
} // codeTop!=NULL
const TUint32 KSecurityUIsTestCode = 0x00000307;
--- a/wim/Scard/inc/ScardConnector.h Fri Jul 30 13:42:45 2010 +0300
+++ b/wim/Scard/inc/ScardConnector.h Fri Aug 06 10:55:57 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -97,13 +97,11 @@
/**
* Two-phased constructor.
* @param aConnRegistry Pointer to connection registry
- * @param aClient Client thread
* @param aMessage Client message
- */
+ */
static CScardConnector* NewL( CScardConnectionRegistry* aConnRegistry,
- RThread& aClient,
- const RMessage2& aMessage );
-
+ const RMessage2& aMessage );
+
/**
* Destructor.
*/
@@ -165,10 +163,8 @@
/**
* C++ default constructor.
* @param aConnRegistry Pointer to connection registry
- * @param aClient Client thread
*/
- CScardConnector( CScardConnectionRegistry* aConnRegistry,
- RThread& aClient );
+ CScardConnector( CScardConnectionRegistry* aConnRegistry );
/**
* By default Symbian 2nd phase constructor is private.
--- a/wim/Scard/src/ScardConnectionRegistry.cpp Fri Jul 30 13:42:45 2010 +0300
+++ b/wim/Scard/src/ScardConnectionRegistry.cpp Fri Aug 06 10:55:57 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -105,16 +105,8 @@
TConnectionHandle handle;
handle.iClient = aClient;
CScardConnector* conn = NULL;
- RThread thread;
-
- TInt err1 = thread.Open( KScardServerName );
-
- if ( err1 != KErrNone )
- {
- _WIMTRACE(_L("WIM|Scard|CScardConnectionRegistry::ConnectToReaderL|Thread open failed"));
- }
- TRAPD( err, conn = CScardConnector::NewL( this, thread, aMessage ) );
+ TRAPD( err, conn = CScardConnector::NewL( this, aMessage ) );
if ( err )
{
#ifdef _DEBUG
--- a/wim/Scard/src/ScardConnector.cpp Fri Jul 30 13:42:45 2010 +0300
+++ b/wim/Scard/src/ScardConnector.cpp Fri Aug 06 10:55:57 2010 +0300
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-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"
@@ -89,17 +89,12 @@
// might leave.
// -----------------------------------------------------------------------------
//
-CScardConnector::CScardConnector(
- CScardConnectionRegistry* aConnRegistry,
- RThread& /*aClient*/ )
- : CScardSession(),
- iConnectionRegistry( aConnRegistry ),
- iState( EActive )
+CScardConnector::CScardConnector( CScardConnectionRegistry* aConnRegistry ) :
+ CScardSession(), iConnectionRegistry( aConnRegistry ), iState( EActive )
{
_WIMTRACE(_L("WIM|Scard|CScardConnector::CScardConnector|Begin"));
}
-
// -----------------------------------------------------------------------------
// CScardConnector::ConstructL
// Symbian 2nd phase constructor can leave.
@@ -120,14 +115,12 @@
// -----------------------------------------------------------------------------
//
CScardConnector* CScardConnector::NewL(
- CScardConnectionRegistry* aConnRegistry,
- RThread& aClient,
+ CScardConnectionRegistry* aConnRegistry,
const RMessage2& aMessage )
{
_WIMTRACE(_L("WIM|Scard|CScardConnector::NewL|Begin"));
- CScardConnector* self = new( ELeave ) CScardConnector( aConnRegistry,
- aClient );
-
+ CScardConnector* self = new( ELeave ) CScardConnector( aConnRegistry );
+
CleanupStack::PushL( self );
self->ConstructL( aMessage );
CleanupStack::Pop( self );
--- a/wim/WimPlugin/src/WimCertStore.cpp Fri Jul 30 13:42:45 2010 +0300
+++ b/wim/WimPlugin/src/WimCertStore.cpp Fri Aug 06 10:55:57 2010 +0300
@@ -1575,6 +1575,8 @@
// and assigned into mapping
SetTrustSettingsOnMappingL( iTrusted,
iCertificateApps );
+ _WIMTRACE3 ( _L( "CWimCertStore::DoInitializeLoadTrustSettingsWaitL(), index=%d, count=%d" ),
+ iCertIndex, iCerts->Count() );
if ( iCertIndex < iCerts->Count() - 1 )
{
iCertIndex++;
--- a/wim/WimServer/src/WimServer.cpp Fri Jul 30 13:42:45 2010 +0300
+++ b/wim/WimServer/src/WimServer.cpp Fri Aug 06 10:55:57 2010 +0300
@@ -486,7 +486,6 @@
case ESetApplicability: //lint -fallthrough
case ESetTrust: //lint -fallthrough
- case ESetDefaultTrustSettings: //lint -fallthrough
case ERemoveTrustSettings:
{
if ( ResolveTrustModficationReqL( aMsg, usage ))
@@ -496,6 +495,16 @@
break;
}
+ case ESetDefaultTrustSettings:
+ {
+ _WIMTRACE( _L("CWimServer::CustomSecurityCheckL, ESetDefaultTrustSettings exception") );
+ if ( ResolveTrustModficationReqL( aMsg, usage ))
+ {
+ test = CheckReadCapsForUsage( aMsg, usage );
+ }
+ }
+ break;
+
case EExportPublicKey:
{
ResolveExportPublicReqL( aMsg, usage );
--- a/wim/WimServer/src/WimTrustSettingsStore.cpp Fri Jul 30 13:42:45 2010 +0300
+++ b/wim/WimServer/src/WimTrustSettingsStore.cpp Fri Aug 06 10:55:57 2010 +0300
@@ -384,6 +384,7 @@
CleanupStack::PopAndDestroy( &applications );
}
);
+ _WIMTRACE2 ( _L( "CWimTrustSettingsStore::DoSetDefaultTrustSettingsL(), err=%d" ), err );
if ( err != KErrNone ) // Some error occured
{
@@ -418,7 +419,8 @@
RemoveApplicationsL( certID ); // Remove applications
RemoveCertificateL( certID ); // Remove certificate
);
-
+ _WIMTRACE2 ( _L( "CWimTrustSettingsStore::DoRemoveTrustSettingsL(), err=%d" ), err );
+
if ( err ) // Some error occurred
{
iDatabase.Rollback(); // Rollback changes