--- a/fotaapplication/fotaserver/fotaserver.pro Tue Jul 13 10:07:47 2010 +0530
+++ b/fotaapplication/fotaserver/fotaserver.pro Fri Jul 23 13:39:21 2010 +0530
@@ -108,7 +108,6 @@
LIBS += -laknskins \
-lapgrfx \
- -lapengine \
-lapparc \
-lapsettingshandlerui \
-lavkon \
--- a/fotaapplication/fotaserver/src/FotaServer.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/fotaapplication/fotaserver/src/FotaServer.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -20,8 +20,8 @@
#include <schtime.h>
#include <csch_cli.h>
#include <e32property.h>
-#include <ApUtils.h>
-#include <commdb.h>
+#include <cmmanager.h>
+#include <cmconnectionmethod.h>
#include <DevManInternalCRKeys.h>
#include <nsmlconstants.h>
#include <centralrepository.h>
@@ -2354,12 +2354,15 @@
TBool CFotaServer::CheckIapExistsL(TUint32 aIapId)
{
FLOG(_L("CFotaServer::CheckIapExistsL >>"));
- CCommsDatabase* commDb = CCommsDatabase::NewL(EDatabaseTypeIAP);
- CleanupStack::PushL(commDb);
- CApUtils* aputils = CApUtils::NewLC(*commDb);
- TBool exists = aputils->IAPExistsL(aIapId);
- CleanupStack::PopAndDestroy(aputils);
- CleanupStack::PopAndDestroy(commDb);
+ TBool exists = EFalse;
+ RCmManager cmManager;
+ cmManager.OpenLC();
+ RCmConnectionMethod conn;
+ TRAPD(err, conn = cmManager.ConnectionMethodL( aIapId ));
+ if(err == KErrNone)//connection method exists
+ exists = ETrue;
+ conn.Close();
+ CleanupStack::PopAndDestroy();//cmManager
FLOG(_L("CFotaServer::CheckIapExistsL <<"));
return exists;
}
--- a/omaprovisioning/provisioning/ProvisioningEngine/Inc/CWPMultiContextManager.h Tue Jul 13 10:07:47 2010 +0530
+++ b/omaprovisioning/provisioning/ProvisioningEngine/Inc/CWPMultiContextManager.h Fri Jul 23 13:39:21 2010 +0530
@@ -66,6 +66,7 @@
protected: // From CActive
void DoCancel();
void RunL();
+ TInt RunError(TInt aError);
public: // From MWPContextManager
--- a/omaprovisioning/provisioning/ProvisioningEngine/Src/CWPMultiContextManager.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/omaprovisioning/provisioning/ProvisioningEngine/Src/CWPMultiContextManager.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -788,6 +788,10 @@
IssueRequest();
}
+TInt CWPMultiContextManager::RunError ( TInt /*aError*/ )
+ {
+ return KErrNone;
+ }
// -----------------------------------------------------------------------------
// CWPMultiContextManager::DoCancel
// -----------------------------------------------------------------------------
--- a/omaprovisioning/provisioning/ProvisioningSC/Inc/CWPWimHandler.h Tue Jul 13 10:07:47 2010 +0530
+++ b/omaprovisioning/provisioning/ProvisioningSC/Inc/CWPWimHandler.h Fri Jul 23 13:39:21 2010 +0530
@@ -76,6 +76,7 @@
protected:
// from CActive
void RunL();
+ TInt RunError(TInt aError);
void DoCancel();
--- a/omaprovisioning/provisioning/ProvisioningSC/Src/CWPSimHandler.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/omaprovisioning/provisioning/ProvisioningSC/Src/CWPSimHandler.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -173,6 +173,10 @@
}
}
+TInt CWPWimHandler::RunError ( TInt /*aError*/ )
+ {
+ return KErrNone;
+ }
// -----------------------------------------------------------------------------
// CWPWimHandler::DoCancel
// Cancel active request
--- a/omaprovisioning/provisioning/ProvisioningSC/Src/CWPWimHandler.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/omaprovisioning/provisioning/ProvisioningSC/Src/CWPWimHandler.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -230,6 +230,10 @@
}
}
+TInt CWPWimHandler::RunError ( TInt /*aError*/ )
+ {
+ return KErrNone;
+ }
// -----------------------------------------------------------------------------
// CWPWimHandler::DoCancel
// Cancel active request
--- a/policymanagement/dmutilserver/inc/DMUtilActiveObserver.h Tue Jul 13 10:07:47 2010 +0530
+++ b/policymanagement/dmutilserver/inc/DMUtilActiveObserver.h Fri Jul 23 13:39:21 2010 +0530
@@ -43,6 +43,7 @@
virtual ~CActiveObserver();
protected:
void RunL();
+ TInt RunError(TInt aError);
private:
CActiveObserver( TPolicyManagementEventTypes aType);
TUint32 SubscribeKey( TPolicyManagementEventTypes aType);
--- a/policymanagement/dmutilserver/src/DMUtilObserver.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/policymanagement/dmutilserver/src/DMUtilObserver.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -291,6 +291,10 @@
iProperty.Subscribe( iStatus);
}
+TInt CActiveObserver::RunError ( TInt /*aError*/ )
+ {
+ return KErrNone;
+ }
// -----------------------------------------------------------------------------
// CActiveObserver::DoCancel
// -----------------------------------------------------------------------------
--- a/syncmlfw/common/http/inc/nsmldialiap.h Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/http/inc/nsmldialiap.h Fri Jul 23 13:39:21 2010 +0530
@@ -47,6 +47,7 @@
private:
void DoCancel();
void RunL();
+ TInt RunError(TInt aError);
private:
TBool IsConnectedL() const;
--- a/syncmlfw/common/http/src/nsmldialiap.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/http/src/nsmldialiap.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -176,6 +176,15 @@
User::RequestComplete( status, iStatus.Int() );
}
}
+// ----------------------------------------------------------------------------
+// CNSmlDialUpAgent::RunError
+// ----------------------------------------------------------------------------
+TInt CNSmlDialUpAgent::RunError ( TInt aError )
+ {
+ DBG_FILE_CODE(aError, _S8("CNSmlDialUpAgent::RunError() The Error occurred is "));
+ return KErrNone;
+ }
+
// ---------------------------------------------------------
// CNSmlDialUpAgent::ConnectL( TUint aIAPid, TRequestStatus &aStatus )
// Opens data call handle
--- a/syncmlfw/common/obex/obexclient/inc/Btobexsearcher.h Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/obex/obexclient/inc/Btobexsearcher.h Fri Jul 23 13:39:21 2010 +0530
@@ -68,6 +68,7 @@
CObexClient* CreateObexClientL();
void RunL();
+ TInt RunError(TInt aError);
void DoCancel();
--- a/syncmlfw/common/obex/obexclient/inc/Irdaobexsearcher.h Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/obex/obexclient/inc/Irdaobexsearcher.h Fri Jul 23 13:39:21 2010 +0530
@@ -62,6 +62,7 @@
protected: // Functions from base classes
void RunL();
+ TInt RunError(TInt aError);
void DoCancel();
--- a/syncmlfw/common/obex/obexclient/inc/NSmlObexClient.h Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/obex/obexclient/inc/NSmlObexClient.h Fri Jul 23 13:39:21 2010 +0530
@@ -96,6 +96,7 @@
protected: // from CActive
void DoCancel();
void RunL();
+ TInt RunError(TInt aError);
protected: //from MObexSearcherObserver
void HandleDeviceFoundL();
--- a/syncmlfw/common/obex/obexclient/src/Btobexsearcher.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/obex/obexclient/src/Btobexsearcher.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -180,6 +180,13 @@
}
}
}
+// ----------------------------------------------------------------------------
+// CBTObexSearcher::RunError
+// ----------------------------------------------------------------------------
+TInt CBTObexSearcher::RunError ( TInt /*aError*/ )
+ {
+ return KErrNone;
+ }
//----------------------------------------------------------------------------
// CBTObexSearcher::DoCancel()
--- a/syncmlfw/common/obex/obexclient/src/Irdaobexsearcher.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/obex/obexclient/src/Irdaobexsearcher.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -189,6 +189,10 @@
}
}
+TInt CIrDAObexSearcher::RunError ( TInt /*aError*/ )
+ {
+ return KErrNone;
+ }
//----------------------------------------------------------------------------
// CIrDAObexSearcher::DoCancel()
//----------------------------------------------------------------------------
--- a/syncmlfw/common/obex/obexclient/src/NSmlObexClient.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/obex/obexclient/src/NSmlObexClient.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -180,6 +180,11 @@
}
}
+TInt CNsmlObexClient::RunError ( TInt aError )
+ {
+ DBG_FILE_CODE(aError, _S8("CNsmlObexClient::RunError() The Error occurred is "));
+ return KErrNone;
+ }
//------------------------------------------------------------
// CNsmlObexClient::ConnectL( TNSmlObexTransport aTransport, TBool /*aServerAlerted*/, TDesC8& aMimeType, TRequestStatus &aStatus )
//------------------------------------------------------------
--- a/syncmlfw/common/sosserver/inc/nsmlsosserver.h Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/sosserver/inc/nsmlsosserver.h Fri Jul 23 13:39:21 2010 +0530
@@ -495,6 +495,7 @@
void ConstructL();
void RunL();
+ TInt RunError(TInt aError);
void DoCancel();
void BackUpModeL();
--- a/syncmlfw/common/sosserver/src/NSmlSOSBackup.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/sosserver/src/NSmlSOSBackup.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -126,6 +126,11 @@
_DBG_FILE("CNSmlSOSBackup::RunL() : End");
}
+TInt CNSmlSOSBackup::RunError ( TInt aError )
+ {
+ DBG_FILE_CODE(aError, _S8("CNSmlSOSBackup::RunError() The Error occurred is "));
+ return KErrNone;
+ }
// --------------------------------------------------------------------------
// void CNSmlSOSBackup::DoCancel()
// --------------------------------------------------------------------------
--- a/syncmlfw/common/sosserver_clientapi/inc/NSmlClientAPIActiveCallback.h Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/sosserver_clientapi/inc/NSmlClientAPIActiveCallback.h Fri Jul 23 13:39:21 2010 +0530
@@ -67,6 +67,7 @@
// from CActive
virtual void DoCancel();
virtual void RunL();
+ virtual TInt RunError(TInt aError);
private:
void Request();
@@ -98,6 +99,7 @@
// from CActive
virtual void DoCancel();
virtual void RunL();
+ virtual TInt RunError(TInt aError);
private:
void Request();
--- a/syncmlfw/common/sosserver_clientapi/inc/NSmlClientContactSuiteAPIActiveCallback.h Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/sosserver_clientapi/inc/NSmlClientContactSuiteAPIActiveCallback.h Fri Jul 23 13:39:21 2010 +0530
@@ -64,6 +64,7 @@
// from CActive
virtual void DoCancel();
virtual void RunL();
+ virtual TInt RunError(TInt aError);
private:
void Request();
--- a/syncmlfw/common/sosserver_clientapi/src/NSmlClientAPIActiveCallback.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/sosserver_clientapi/src/NSmlClientAPIActiveCallback.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -267,6 +267,10 @@
#endif
}
+TInt CSmlActiveEventCallback::RunError ( TInt /*aError*/ )
+ {
+ return KErrNone;
+ }
// -----------------------------------------------------------------------------
// CSmlActiveEventCallback::Request()
// Makes an event request to server.
@@ -437,7 +441,10 @@
}
#endif
}
-
+TInt CSmlActiveProgressCallback::RunError ( TInt /*aError*/ )
+ {
+ return KErrNone;
+ }
// -----------------------------------------------------------------------------
// CSmlActiveProgressCallback::Request()
// Sends asynchronous progress event request to server.
--- a/syncmlfw/common/sosserver_clientapi/src/NSmlClientContactSuiteAPIActiveCallback.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/common/sosserver_clientapi/src/NSmlClientContactSuiteAPIActiveCallback.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -155,6 +155,10 @@
#endif
}
+TInt CSmlActiveContactSuiteProgressCallback::RunError ( TInt /*aError*/ )
+ {
+ return KErrNone;
+ }
// -----------------------------------------------------------------------------
// CSmlActiveContactSuiteProgressCallback::Request()
// Sends asynchronous progress event request to server.
--- a/syncmlfw/dm/dmnetworkmon/src/DMNetworkMon.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/dm/dmnetworkmon/src/DMNetworkMon.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -164,7 +164,7 @@
TInt CDMNetworkMon::RunError ( TInt aError )
{
DBG_FILE_CODE(aError, _S8("CDMNetworkMon::RunError() The Error occurred is "));
- return aError;
+ return KErrNone;
}
// ----------------------------------------------------------------------------
--- a/syncmlfw/ds/hostserver/dshostserverbase/inc/Nsmldsasyncrequesthandler.h Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/ds/hostserver/dshostserverbase/inc/Nsmldsasyncrequesthandler.h Fri Jul 23 13:39:21 2010 +0530
@@ -249,7 +249,8 @@
private: // Functions from base classes
virtual void DoCancel();
- virtual void RunL();
+ virtual void RunL();
+ TInt RunError ( TInt aError );
public:
protected:
--- a/syncmlfw/ds/hostserver/dshostserverbase/src/NsmldschangedItemsFetcher.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/ds/hostserver/dshostserverbase/src/NsmldschangedItemsFetcher.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -177,5 +177,12 @@
User::RequestComplete( rstatus, KErrNone );
}
}
-
+
+// ----------------------------------------------------------------------------
+// CNSmlDSChangedItemsFetcher::RunError
+// ----------------------------------------------------------------------------
+TInt CNSmlDSChangedItemsFetcher::RunError ( TInt aError )
+{
+ return KErrNone;
+}
// End of File
--- a/syncmlfw/ds/netmon/src/CNetMon.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/ds/netmon/src/CNetMon.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -164,7 +164,7 @@
TInt CNetMon::RunError ( TInt aError )
{
DBG_FILE_CODE(aError, _S8("CNetMon::RunError() The Error occurred is "));
- return aError;
+ return KErrNone;
}
// ----------------------------------------------------------------------------
--- a/syncmlfw/ds/syncagent/src/nsmldsnetmon.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/syncmlfw/ds/syncagent/src/nsmldsnetmon.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -138,7 +138,7 @@
// ----------------------------------------------------------------------------
TInt CNsmlDSNetmon::RunError ( TInt aError )
{
- return aError;
+ return KErrNone;
}
// ----------------------------------------------------------------------------
--- a/terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp Tue Jul 13 10:07:47 2010 +0530
+++ b/terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp Fri Jul 23 13:39:21 2010 +0530
@@ -185,6 +185,13 @@
Dprint(_L("CSCPLockObserver::RunL() END"));
}
+// ----------------------------------------------------------------------------
+// CSCPLockObserver::RunError
+// ----------------------------------------------------------------------------
+TInt CSCPLockObserver::RunError ( TInt /*aError*/ )
+ {
+ return KErrNone;
+ }
//
// ----------------------------------------------------------
// CSCPLockObserver::DoCancel()