diff -r 41a7f70b3818 -r 5266b1f337bd phoneengine/phonemodel/src/cpeparsersimcontrolhandler.cpp --- a/phoneengine/phonemodel/src/cpeparsersimcontrolhandler.cpp Tue Aug 31 15:14:29 2010 +0300 +++ b/phoneengine/phonemodel/src/cpeparsersimcontrolhandler.cpp Wed Sep 01 12:30:10 2010 +0100 @@ -49,12 +49,12 @@ CPEParserSimControlHandler::~CPEParserSimControlHandler() { if( iSecurityModel != NULL ) - { - iSecurityModel->CancelChangePin(); - iSecurityModel->CancelUnblockPin(); - delete iSecurityModel; - TSecUi::UnInitializeLib(); - } + { + iSecurityModel->CancelChangePin(); + iSecurityModel->CancelUnblockPin(); + delete iSecurityModel; + TSecUi::UnInitializeLib(); + } TEFLOGSTRING( KTAOBJECT, "PE CPEParserSimControlHandler::~CPEParserSimControlHandler: complete"); } @@ -108,13 +108,13 @@ break; } - if( iSecurityModel == NULL ) - { - TSecUi::InitializeLibL(); - iSecurityModel = CManualSecuritySettings::NewL(); - TEFLOGSTRING( KTAOBJECT, - "PE CPEParserSimControlHandler::ConstructL" ); - } + if( iSecurityModel == NULL ) + { + TSecUi::InitializeLibL(); + iSecurityModel = CManualSecuritySettings::NewL(); + TEFLOGSTRING( KTAOBJECT, + "PE CPEParserSimControlHandler::ConstructL" ); + } if( iSecurityModel->ChangePinL( pin, aOldPin, aNewPin, aVerifyNew ) ) { @@ -157,14 +157,14 @@ break; } - if( iSecurityModel == NULL ) - { - TSecUi::InitializeLibL(); - iSecurityModel = CManualSecuritySettings::NewL(); - TEFLOGSTRING( KTAOBJECT, - "PE CPEParserSimControlHandler::ConstructL" ); - } - + if( iSecurityModel == NULL ) + { + TSecUi::InitializeLibL(); + iSecurityModel = CManualSecuritySettings::NewL(); + TEFLOGSTRING( KTAOBJECT, + "PE CPEParserSimControlHandler::ConstructL" ); + } + if( iSecurityModel->UnblockPinL( pin, aPuk, aNewPin, aVerifyNew ) ) { iSupplementaryServicesCommandInfo.action = EPEPasswordOperation;