diff -r 0ed94ceaa377 -r cb62a4f66ebe browserutilities/connectionmanager/Src/InternetConnectionManager.cpp --- a/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Thu Dec 17 09:20:16 2009 +0200 +++ b/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Thu Jan 07 13:31:38 2010 +0200 @@ -65,10 +65,10 @@ #include //User Includes -#include "internetconnectionmanager.h" +#include #include "connman.hrh" #include "connectionmanagerlogger.h" -#include "connectionobservers.h" +#include #include "connmanactiveconnector.h" using namespace CMManager; @@ -1041,7 +1041,7 @@ if (iConnectionType == EDestination) { - err = ConnectWithSnapId(iRequestedSnapId); + err = ConnectWithSnapIdL(iRequestedSnapId); return err; } else @@ -1642,6 +1642,17 @@ } //------------------------------------------------------------------------ +//CInternetConnectionManager::CancelConnection +// + void CInternetConnectionManager::CancelConnection() + { + if(iSyncConnector && iSyncConnector->IsActive()) + { + iSyncConnector->Cancel(); + } + } + +//------------------------------------------------------------------------ //CInternetConnectionManager::AskIap //------------------------------------------------------------------------ EXPORT_C TInt CInternetConnectionManager::AskIap( TUint32& aNewIap ) @@ -2000,9 +2011,9 @@ } //------------------------------------------------------------------------ -//CInternetConnectionManager::ConnectWithSnapId +//CInternetConnectionManager::ConnectWithSnapIdL //------------------------------------------------------------------------ -TInt CInternetConnectionManager::ConnectWithSnapId(TUint32 aRequestedSnapId) +TInt CInternetConnectionManager::ConnectWithSnapIdL(TUint32 aRequestedSnapId) { CLOG_WRITE_1( "CInternetConnectionManager::ConnectWithSnapId - %d", aRequestedSnapId );