--- a/policymanagement/policyengine/group/bld.inf Mon May 03 13:19:46 2010 +0300
+++ b/policymanagement/policyengine/group/bld.inf Sat May 01 10:33:10 2010 +0530
@@ -34,7 +34,7 @@
PRJ_MMPFILES
PolicyEngineClient.mmp
CentRepToolClient.mmp
-PolicyEngineUI.mmp
+//PolicyEngineUI.mmp
PolicyEngineServer.mmp
CentRepToolServer.mmp
PMRfsPlugin.mmp
--- a/policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp Mon May 03 13:19:46 2010 +0300
+++ b/policymanagement/policyengine/policyengineserver/src/PolicyProcessor.cpp Sat May 01 10:33:10 2010 +0530
@@ -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);
}
--- 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 Sat May 01 10:33:10 2010 +0530
@@ -21,7 +21,7 @@
#include <e32base.h>
#include <e32cmn.h>
-#include "NSmlConstantDefs.h"
+#include "nsmlconstantdefs.h"
const TUid KNSmlSOSServerPolicyUID = { 0x101F99FB };
--- 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 Sat May 01 10:33:10 2010 +0530
@@ -22,7 +22,7 @@
// INCLUDES
#include <e32base.h>
#include <nsmlsnapshotitem.h>
-#include <smldataprovider.h>
+#include <SmlDataProvider.h>
// CONSTANTS
const TInt KNSmlDefaultSnapshotStreamUID = 0x101F6DE4;
--- a/syncmlfw/common/obex/obexclient/inc/Btobexsearcher.h Mon May 03 13:19:46 2010 +0300
+++ b/syncmlfw/common/obex/obexclient/inc/Btobexsearcher.h Sat May 01 10:33:10 2010 +0530
@@ -122,7 +122,7 @@
TPckgBuf<TBool> iOffline;
- RNotifier iNotifier;
+ // RNotifier iNotifier;
CBTEngSettings* iSettings;
};
--- a/syncmlfw/common/obex/obexclient/inc/NSmlBTServiceSearcher.h Mon May 03 13:19:46 2010 +0300
+++ b/syncmlfw/common/obex/obexclient/inc/NSmlBTServiceSearcher.h Sat May 01 10:33:10 2010 +0530
@@ -82,7 +82,7 @@
private:
TRequestStatus* iStatusObserver;
TBool iIsDeviceSelectorConnected;
- RNotifier iDeviceSelector;
+// RNotifier iDeviceSelector;
TBTDeviceResponseParamsPckg iResponse;
CSdpAgent* iAgent;
CSdpSearchPattern* iSdpSearchPattern;
--- a/syncmlfw/common/obex/obexclient/src/Btobexsearcher.cpp Mon May 03 13:19:46 2010 +0300
+++ b/syncmlfw/common/obex/obexclient/src/Btobexsearcher.cpp Sat May 01 10:33:10 2010 +0530
@@ -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 )
--- a/syncmlfw/common/obex/obexclient/src/NSmlBTServiceSearcher.cpp Mon May 03 13:19:46 2010 +0300
+++ b/syncmlfw/common/obex/obexclient/src/NSmlBTServiceSearcher.cpp Sat May 01 10:33:10 2010 +0530
@@ -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);
}
--- a/syncmlfw/common/sosserver/inc/nsmlsosthread.h Mon May 03 13:19:46 2010 +0300
+++ b/syncmlfw/common/sosserver/inc/nsmlsosthread.h Sat May 01 10:33:10 2010 +0530
@@ -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;
--- a/syncmlfw/common/sosserver/src/nsmlsosthread.cpp Mon May 03 13:19:46 2010 +0300
+++ b/syncmlfw/common/sosserver/src/nsmlsosthread.cpp Sat May 01 10:33:10 2010 +0530
@@ -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
{
--- a/syncmlfw/dm/syncagent/inc/NSmlDMAgent.h Mon May 03 13:19:46 2010 +0300
+++ b/syncmlfw/dm/syncagent/inc/NSmlDMAgent.h Sat May 01 10:33:10 2010 +0530
@@ -271,7 +271,7 @@
private:
TRequestStatus& iCallerStatus;
- RNotifier iNotifier;
+// RNotifier iNotifier;
TSyncMLAppLaunchNotifRetValPckg iResBuf;
TInt& iCreatorId;
--- a/syncmlfw/dm/syncagent/src/nsmldmagent.cpp Mon May 03 13:19:46 2010 +0300
+++ b/syncmlfw/dm/syncagent/src/nsmldmagent.cpp Sat May 01 10:33:10 2010 +0530
@@ -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 );
}
// --------------------------------------------------------------------------
--- a/syncmlfw/dm/syncagent/src/nsmldmcmds.cpp Mon May 03 13:19:46 2010 +0300
+++ b/syncmlfw/dm/syncagent/src/nsmldmcmds.cpp Sat May 01 10:33:10 2010 +0530
@@ -1395,7 +1395,7 @@
TPckgBuf<TSyncMLDlgNotifParams> 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<KSyncMLMaxAlertResultLength> 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<TBool> resBuf;
if( dataBuf16->Length() > KSyncMLMaxServerMsgLength )
{
@@ -1659,16 +1664,18 @@
TPckgBuf<TSyncMLDlgNotifParams> pkgBuf( notifyParams );
TSyncMLDlgNotifReturnParams emptybuf;
TSyncMLDlgNotifReturnParamsPckg resultBuf( emptybuf );
- notifier.StartNotifierAndGetResponse( status, KNSmlSyncDialogUid, pkgBuf, resultBuf );
+/* notifier.StartNotifierAndGetResponse( status, KNSmlSyncDialogUid, pkgBuf, resultBuf );
User::WaitForRequest( status );
+*/
TBuf8<KSyncMLMaxDefaultResponseMsgLength> 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<TSyncMLDlgNotifParams> 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
{
--- a/syncmlfw/dm/treemodule/src/nsmldmddf.cpp Mon May 03 13:19:46 2010 +0300
+++ b/syncmlfw/dm/treemodule/src/nsmldmddf.cpp Sat May 01 10:33:10 2010 +0530
@@ -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;