# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1273844570 -10800 # Node ID 2c8580950a26dc2468df20b9c3d10a027825804a # Parent bf47f3b7915499a3d9455a113eade866cc7431c6 Revision: 201017 Kit: 201019 diff -r bf47f3b79154 -r 2c8580950a26 policymanagement/policyengine/group/bld.inf --- a/policymanagement/policyengine/group/bld.inf Mon May 03 13:19:46 2010 +0300 +++ b/policymanagement/policyengine/group/bld.inf Fri May 14 16:42:50 2010 +0300 @@ -34,7 +34,7 @@ PRJ_MMPFILES PolicyEngineClient.mmp CentRepToolClient.mmp -PolicyEngineUI.mmp +//PolicyEngineUI.mmp PolicyEngineServer.mmp CentRepToolServer.mmp PMRfsPlugin.mmp diff -r bf47f3b79154 -r 2c8580950a26 policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp --- a/policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp Mon May 03 13:19:46 2010 +0300 +++ b/policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp Fri May 14 16:42:50 2010 +0300 @@ -752,10 +752,10 @@ if ( name.Length() && fingerPrint.Length()) { //create notifier - RNotifier notifier; +/* RNotifier notifier; CleanupClosePushL( notifier); User::LeaveIfError( notifier.Connect() ); - +*/ //create parameter descriptor TBuf8<100> responseBuf; HBufC8 * data = HBufC8::NewLC( name.Length() + fingerPrint.Length() + 1); @@ -766,7 +766,7 @@ //create CAsyncHandler to Auto start/stop CActiveScheduler CASyncHandler * async = CASyncHandler::NewLC(); - notifier.StartNotifierAndGetResponse( async->GetRequestStatus(), KUidPolicyEngineUi, ptr, responseBuf); +// notifier.StartNotifierAndGetResponse( async->GetRequestStatus(), KUidPolicyEngineUi, ptr, responseBuf); //Start CActiveScheduler and execute stop when request is completed async->WaitForRequest(); @@ -775,7 +775,7 @@ if ( async->GetRequestStatus() > 0) //request pending... { - notifier.CancelNotifier( KUidPolicyEngineUi); +// notifier.CancelNotifier( KUidPolicyEngineUi); } else { @@ -787,7 +787,8 @@ } } - CleanupStack::PopAndDestroy( 3, ¬ifier); //notifier, data, CASyncHandler + // CleanupStack::PopAndDestroy( 3, ¬ifier); //notifier, data, CASyncHandler + CleanupStack::PopAndDestroy( 2); } diff -r bf47f3b79154 -r 2c8580950a26 remotemgmt_plat/common_agent_util_and_definitions_api/inc/nsmlconstants.h --- a/remotemgmt_plat/common_agent_util_and_definitions_api/inc/nsmlconstants.h Mon May 03 13:19:46 2010 +0300 +++ b/remotemgmt_plat/common_agent_util_and_definitions_api/inc/nsmlconstants.h Fri May 14 16:42:50 2010 +0300 @@ -21,7 +21,7 @@ #include #include -#include "NSmlConstantDefs.h" +#include "nsmlconstantdefs.h" const TUid KNSmlSOSServerPolicyUID = { 0x101F99FB }; diff -r bf47f3b79154 -r 2c8580950a26 remotemgmt_plat/oma_ds_extensions_api/inc/nsmlchangefinder.h --- a/remotemgmt_plat/oma_ds_extensions_api/inc/nsmlchangefinder.h Mon May 03 13:19:46 2010 +0300 +++ b/remotemgmt_plat/oma_ds_extensions_api/inc/nsmlchangefinder.h Fri May 14 16:42:50 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include #include -#include +#include // CONSTANTS const TInt KNSmlDefaultSnapshotStreamUID = 0x101F6DE4; diff -r bf47f3b79154 -r 2c8580950a26 syncmlfw/common/obex/obexclient/inc/Btobexsearcher.h --- a/syncmlfw/common/obex/obexclient/inc/Btobexsearcher.h Mon May 03 13:19:46 2010 +0300 +++ b/syncmlfw/common/obex/obexclient/inc/Btobexsearcher.h Fri May 14 16:42:50 2010 +0300 @@ -122,7 +122,7 @@ TPckgBuf iOffline; - RNotifier iNotifier; + // RNotifier iNotifier; CBTEngSettings* iSettings; }; diff -r bf47f3b79154 -r 2c8580950a26 syncmlfw/common/obex/obexclient/inc/NSmlBTServiceSearcher.h --- a/syncmlfw/common/obex/obexclient/inc/NSmlBTServiceSearcher.h Mon May 03 13:19:46 2010 +0300 +++ b/syncmlfw/common/obex/obexclient/inc/NSmlBTServiceSearcher.h Fri May 14 16:42:50 2010 +0300 @@ -82,7 +82,7 @@ private: TRequestStatus* iStatusObserver; TBool iIsDeviceSelectorConnected; - RNotifier iDeviceSelector; +// RNotifier iDeviceSelector; TBTDeviceResponseParamsPckg iResponse; CSdpAgent* iAgent; CSdpSearchPattern* iSdpSearchPattern; diff -r bf47f3b79154 -r 2c8580950a26 syncmlfw/common/obex/obexclient/src/Btobexsearcher.cpp --- a/syncmlfw/common/obex/obexclient/src/Btobexsearcher.cpp Mon May 03 13:19:46 2010 +0300 +++ b/syncmlfw/common/obex/obexclient/src/Btobexsearcher.cpp Fri May 14 16:42:50 2010 +0300 @@ -80,10 +80,11 @@ Cancel(); delete iServiceSearcher; delete iSettings; - if ( iNotifier.Handle() ) +/* if ( iNotifier.Handle() ) { iNotifier.Close(); } +*/ } //---------------------------------------------------------------------------- @@ -137,10 +138,11 @@ { if( iWaitingForBTPower && iOffline() != EFalse ) { - if ( iNotifier.Handle() ) + /* if ( iNotifier.Handle() ) { iNotifier.Close(); } + */ TInt err = iSettings->ChangePowerStateTemporarily( ); if( err ) { @@ -293,13 +295,14 @@ if( offline == ECoreAppUIsNetworkConnectionNotAllowed && offlineAllowed == EBTEnabledInOfflineMode ) { - User::LeaveIfError( iNotifier.Connect() ); +/* User::LeaveIfError( iNotifier.Connect() ); TBTGenericQueryNotiferParamsPckg pckg; pckg().iMessageType = EBTActivateOffLineQuery; pckg().iNameExists = EFalse; iNotifier.StartNotifierAndGetResponse( iStatus, KBTGenericQueryNotifierUid, pckg, iOffline ); SetActive(); +*/ } else if( offline == ECoreAppUIsNetworkConnectionNotAllowed && offlineAllowed == EBTDisabledInOfflineMode ) diff -r bf47f3b79154 -r 2c8580950a26 syncmlfw/common/obex/obexclient/src/NSmlBTServiceSearcher.cpp --- a/syncmlfw/common/obex/obexclient/src/NSmlBTServiceSearcher.cpp Mon May 03 13:19:46 2010 +0300 +++ b/syncmlfw/common/obex/obexclient/src/NSmlBTServiceSearcher.cpp Fri May 14 16:42:50 2010 +0300 @@ -38,8 +38,9 @@ { if( iIsDeviceSelectorConnected ) { - iDeviceSelector.CancelNotifier( KDeviceSelectionNotifierUid ); +/* iDeviceSelector.CancelNotifier( KDeviceSelectionNotifierUid ); iDeviceSelector.Close(); + */ } Finished(); delete iSdpSearchPattern; @@ -55,8 +56,10 @@ { if( !iIsDeviceSelectorConnected ) { + /* User::LeaveIfError( iDeviceSelector.Connect() ); iIsDeviceSelectorConnected = ETrue; +*/ } // Request a device selection @@ -69,11 +72,11 @@ pckg().SetUUID( iBTConnInfo.iServiceClass ); - iDeviceSelector.StartNotifierAndGetResponse( - aObserverRequestStatus, - KDeviceSelectionNotifierUid, - /*selectionFilter*/pckg, - iResponse); +// iDeviceSelector.StartNotifierAndGetResponse( +// aObserverRequestStatus, +// KDeviceSelectionNotifierUid, +// /*selectionFilter*/pckg, +// iResponse); } diff -r bf47f3b79154 -r 2c8580950a26 syncmlfw/common/sosserver/inc/nsmlsosthread.h --- a/syncmlfw/common/sosserver/inc/nsmlsosthread.h Mon May 03 13:19:46 2010 +0300 +++ b/syncmlfw/common/sosserver/inc/nsmlsosthread.h Fri May 14 16:42:50 2010 +0300 @@ -125,7 +125,7 @@ //used for server alert initiated job RTimer iTimeout; - RNotifier iNotifier; +// RNotifier iNotifier; CNSmlNotifierObserver* iNotifierObserver; RLibrary iSessionLib; CNSmlDMAgent* iDMAgent; @@ -193,7 +193,7 @@ private: TRequestStatus& iCallerStatus; - RNotifier iNotifier; +// RNotifier iNotifier; TSyncMLAppLaunchNotifRetValPckg iResBuf; CNSmlThreadParams& iThreadParams; diff -r bf47f3b79154 -r 2c8580950a26 syncmlfw/common/sosserver/src/nsmlsosthread.cpp --- a/syncmlfw/common/sosserver/src/nsmlsosthread.cpp Mon May 03 13:19:46 2010 +0300 +++ b/syncmlfw/common/sosserver/src/nsmlsosthread.cpp Fri May 14 16:42:50 2010 +0300 @@ -811,10 +811,10 @@ if (!iHbSyncmlNotifierEnabled) { - iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. +// iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. - iNotifier.CancelNotifier(KUidNotifier); - iNotifier.Close(); +// iNotifier.CancelNotifier(KUidNotifier); +// iNotifier.Close(); } else { @@ -849,15 +849,15 @@ TInt err = KErrNone; - if (!iHbSyncmlNotifierEnabled) //Syncml notifier + /* if (!iHbSyncmlNotifierEnabled) //Syncml notifier err = iNotifier.Connect(); - +*/ if (err == KErrNone) { if (!iHbSyncmlNotifierEnabled) { - iNotifier.StartNotifierAndGetResponse(iStatus, KUidNotifier, - data, iResBuf); +// iNotifier.StartNotifierAndGetResponse(iStatus, KUidNotifier, +// data, iResBuf); LOGSTRING2( "CNSmlNotifierObserver::ConnectToNotifierL %d after connect, StartNotifierAndGetResponse and after setactive" , iStatus.Int()); } else @@ -1015,8 +1015,8 @@ if(!iHbSyncmlNotifierEnabled) { TBuf8<1> dummy; - iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. - iNotifier.CancelNotifier( KUidNotifier ); +// iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. +// iNotifier.CancelNotifier( KUidNotifier ); } else { diff -r bf47f3b79154 -r 2c8580950a26 syncmlfw/dm/syncagent/inc/NSmlDMAgent.h --- a/syncmlfw/dm/syncagent/inc/NSmlDMAgent.h Mon May 03 13:19:46 2010 +0300 +++ b/syncmlfw/dm/syncagent/inc/NSmlDMAgent.h Fri May 14 16:42:50 2010 +0300 @@ -271,7 +271,7 @@ private: TRequestStatus& iCallerStatus; - RNotifier iNotifier; +// RNotifier iNotifier; TSyncMLAppLaunchNotifRetValPckg iResBuf; TInt& iCreatorId; diff -r bf47f3b79154 -r 2c8580950a26 syncmlfw/dm/syncagent/src/nsmldmagent.cpp --- a/syncmlfw/dm/syncagent/src/nsmldmagent.cpp Mon May 03 13:19:46 2010 +0300 +++ b/syncmlfw/dm/syncagent/src/nsmldmagent.cpp Fri May 14 16:42:50 2010 +0300 @@ -1877,9 +1877,9 @@ // StartNotifier called to avoid Notifier server panic, if // notifier does not exist anymore. TBuf8<1> dummy; - iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. - iNotifier.CancelNotifier( KUidNotifier ); - iNotifier.Close(); +// iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. +// iNotifier.CancelNotifier( KUidNotifier ); +// iNotifier.Close(); iNotifierTimeOut.Cancel(); Cancel(); } @@ -1910,8 +1910,8 @@ CleanupStack::PopAndDestroy( rep); iNotifierTimeOut.LaunchNotifierTimer( this ); - User::LeaveIfError( iNotifier.Connect() ); - iNotifier.StartNotifierAndGetResponse( iStatus, KUidNotifier, data, iResBuf ); +// User::LeaveIfError( iNotifier.Connect() ); +// iNotifier.StartNotifierAndGetResponse( iStatus, KUidNotifier, data, iResBuf ); } // -------------------------------------------------------------------------- @@ -1925,9 +1925,9 @@ // StartNotifier called to avoid Notifier server panic, if // notifier does not exist anymore. TBuf8<1> dummy; - iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. +// iNotifier.StartNotifier(KNullUid, dummy, dummy); // KNullUid should do also.. - iNotifier.CancelNotifier( KUidNotifier ); +// iNotifier.CancelNotifier( KUidNotifier ); } // -------------------------------------------------------------------------- diff -r bf47f3b79154 -r 2c8580950a26 syncmlfw/dm/syncagent/src/nsmldmcmds.cpp --- a/syncmlfw/dm/syncagent/src/nsmldmcmds.cpp Mon May 03 13:19:46 2010 +0300 +++ b/syncmlfw/dm/syncagent/src/nsmldmcmds.cpp Fri May 14 16:42:50 2010 +0300 @@ -1395,7 +1395,7 @@ TPckgBuf pkgBuf( notifyParams ); TSyncMLDlgNotifReturnParams emptybuf; TSyncMLDlgNotifReturnParamsPckg resultBuf( emptybuf ); - RNotifier notifier; +/* RNotifier notifier; User::LeaveIfError( notifier.Connect() ); CleanupClosePushL(notifier); //cs 7 _DBG_FILE("starting choice notifier"); @@ -1403,6 +1403,8 @@ _DBG_FILE("notifier returned"); User::WaitForRequest( status ); CleanupStack::PopAndDestroy(4);//notifier,lengthbuf,listitems,choiceitemslength +*/ + CleanupStack::PopAndDestroy(3);//lengthbuf,listitems,choiceitemslength iChunk.Close(); TBuf8 rettext; rettext.Copy( resultBuf().irettext.Left( KSyncMLMaxAlertResultLength ) ); @@ -1531,7 +1533,8 @@ if(!IsHbSyncmlNotifierEnabledL()) { - RNotifier notifier; + _DBG_FILE("starting notifier"); +/* RNotifier notifier; User::LeaveIfError(notifier.Connect()); CleanupClosePushL(notifier); @@ -1545,6 +1548,7 @@ //TBool ret = resBuf(); CleanupStack::PopAndDestroy(); + */ } else { @@ -1637,9 +1641,10 @@ return; } CleanupStack::PushL(dataBuf16); //cs - RNotifier notifier; +/* RNotifier notifier; User::LeaveIfError( notifier.Connect() ); CleanupClosePushL(notifier); //cs +*/ TPckgBuf resBuf; if( dataBuf16->Length() > KSyncMLMaxServerMsgLength ) { @@ -1659,16 +1664,18 @@ TPckgBuf pkgBuf( notifyParams ); TSyncMLDlgNotifReturnParams emptybuf; TSyncMLDlgNotifReturnParamsPckg resultBuf( emptybuf ); - notifier.StartNotifierAndGetResponse( status, KNSmlSyncDialogUid, pkgBuf, resultBuf ); +/* notifier.StartNotifierAndGetResponse( status, KNSmlSyncDialogUid, pkgBuf, resultBuf ); User::WaitForRequest( status ); +*/ TBuf8 rettext; rettext.Copy( resultBuf().irettext.Left( KSyncMLMaxDefaultResponseMsgLength ) ); - if ( status == KErrCancel || status == KErrTimedOut || status == KErrAbort ) +/* if ( status == KErrCancel || status == KErrTimedOut || status == KErrAbort ) { TInt error = TNSmlError::ESmlStatusOperationCancelled ; iStatusToServer->SetStatusCodeL( aStatusId, error ); HandleAlertErrorL(); } +*/ //For sending data to server SmlPcdata_t* data = NULL; PcdataNewL( data, rettext); @@ -1676,10 +1683,12 @@ iStatusToServer->AddItemDataL( aStatusId, data ); CleanupStack::PopAndDestroy(); //data if( DRPresent ) - CleanupStack::PopAndDestroy(6); //notifier,alertData,alertDataWithMDT,dataBuf16,hptr,DrBuf16 + CleanupStack::PopAndDestroy(5); //alertData,alertDataWithMDT,dataBuf16,hptr,DrBuf16 +// CleanupStack::PopAndDestroy(6); //notifier,alertData,alertDataWithMDT,dataBuf16,hptr,DrBuf16 else //#endif - CleanupStack::PopAndDestroy(4); //notifier,alertData,alertDataWithMDT,dataBuf16 +// CleanupStack::PopAndDestroy(4); //notifier,alertData,alertDataWithMDT,dataBuf16 + CleanupStack::PopAndDestroy(3); //alertData,alertDataWithMDT,dataBuf16 } // --------------------------------------------------------- @@ -1735,13 +1744,14 @@ TPckgBuf pkgBuf( notifyParams ); if(!IsHbSyncmlNotifierEnabledL()) { - RNotifier notifier; + /* RNotifier notifier; User::LeaveIfError(notifier.Connect()); CleanupClosePushL(notifier); notifier.StartNotifierAndGetResponse(status, KNSmlSyncDialogUid, pkgBuf, resBuf); User::WaitForRequest(status); CleanupStack::PopAndDestroy(); //notifier +*/ } else { diff -r bf47f3b79154 -r 2c8580950a26 syncmlfw/dm/treemodule/src/nsmldmddf.cpp --- a/syncmlfw/dm/treemodule/src/nsmldmddf.cpp Mon May 03 13:19:46 2010 +0300 +++ b/syncmlfw/dm/treemodule/src/nsmldmddf.cpp Fri May 14 16:42:50 2010 +0300 @@ -797,7 +797,7 @@ TAccess ret(ENotExist); TUint8 access(0); TUriCheck found = CheckAdapterL(aURI,access); - if(found!=EUriNotFound) + if(aURI.Length() > 0 && found!=EUriNotFound) { //uri OK, now check the access which is set in ddf ret = ENotAccess;