diff -r 418d2f9448b9 -r 3d94ea3e909b languageinterworkingfw/servicehandler/src/liwservicehandlerimpl.cpp --- a/languageinterworkingfw/servicehandler/src/liwservicehandlerimpl.cpp Thu Aug 19 10:46:29 2010 +0300 +++ b/languageinterworkingfw/servicehandler/src/liwservicehandlerimpl.cpp Tue Aug 31 16:06:08 2010 +0300 @@ -37,7 +37,7 @@ #include "liwxmlhandler.h" #include "liwservicedata.h" -#include + #include // CONSTANTS @@ -54,10 +54,6 @@ // The whole range that is reserved to all menu panes. Currently value is 170 000. const TInt KMenuPaneCommandRange = (KMaxMenuResources + 1) * KIndividualMenuPaneIdRange; -const TUid KMyPropertyCat = { 0x10282822 }; - -enum TMyPropertyKeys { EMyPropertyState = 115, EMyPropertyFinalState = 116}; - _LIT(KLiwResourceFile, "liwServiceHandler.rsc"); _LIT(KLiwZDrive, "z:"); _LIT8(KDataSeparator, "||"); @@ -431,12 +427,6 @@ return (this->AttachL(aInterest,NULL)); } -TInt CLiwServiceHandlerImpl::AttachL(const RCriteriaArray& aInterest,CRTSecMgrScriptSession* aSecMgrScriptSession,TInt aWidgetId) - { - iWidgetId = aWidgetId; - return (this->AttachL(aInterest,aSecMgrScriptSession)); - } - TInt CLiwServiceHandlerImpl::AttachL(const RCriteriaArray& aInterest ,CRTSecMgrScriptSession* aSecMgrScriptSession) { RCriteriaArray interest, filtered; @@ -2867,17 +2857,11 @@ { if(aScriptSession->PromptOption() == RTPROMPTUI_PROVIDER) { - GetProviderResourceFile(provResourcePath, pServiceData->GetMetaData()); - RProperty::Set( KMyPropertyCat, EMyPropertyState , iWidgetId ); - isAllowed = aScriptSession->IsAllowed(provCaps, pChosenImpl->ImplementationUid(), provResourcePath); - RProperty::Set( KMyPropertyCat, EMyPropertyFinalState , iWidgetId ); - } + GetProviderResourceFile(provResourcePath, pServiceData->GetMetaData()); + isAllowed = aScriptSession->IsAllowed(provCaps, pChosenImpl->ImplementationUid(), provResourcePath); + } else - { - RProperty::Set( KMyPropertyCat, EMyPropertyState , iWidgetId ); isAllowed = aScriptSession->IsAllowed(provCaps); - RProperty::Set( KMyPropertyCat, EMyPropertyFinalState , iWidgetId ); - } } if(KErrNone==isAllowed)