equal
deleted
inserted
replaced
63 #include <cmdestinationext.h> |
63 #include <cmdestinationext.h> |
64 #include <commsdat.h> |
64 #include <commsdat.h> |
65 #include <CommsDatTypeInfoV1_1.h> |
65 #include <CommsDatTypeInfoV1_1.h> |
66 |
66 |
67 //User Includes |
67 //User Includes |
68 #include "internetconnectionmanager.h" |
68 #include <internetconnectionmanager.h> |
69 #include "connman.hrh" |
69 #include "connman.hrh" |
70 #include "connectionmanagerlogger.h" |
70 #include "connectionmanagerlogger.h" |
71 #include "connectionobservers.h" |
71 #include <connectionobservers.h> |
72 #include "connmanactiveconnector.h" |
72 #include "connmanactiveconnector.h" |
73 |
73 |
74 using namespace CMManager; |
74 using namespace CMManager; |
75 |
75 |
76 // CONSTANTS |
76 // CONSTANTS |
1039 |
1039 |
1040 //Connect with Snap Id if the connection type is Destination Nw |
1040 //Connect with Snap Id if the connection type is Destination Nw |
1041 |
1041 |
1042 if (iConnectionType == EDestination) |
1042 if (iConnectionType == EDestination) |
1043 { |
1043 { |
1044 err = ConnectWithSnapId(iRequestedSnapId); |
1044 err = ConnectWithSnapIdL(iRequestedSnapId); |
1045 return err; |
1045 return err; |
1046 } |
1046 } |
1047 else |
1047 else |
1048 { |
1048 { |
1049 |
1049 |
1640 { |
1640 { |
1641 TRAP_IGNORE( DoShowConnectionChangedDlgL() ); |
1641 TRAP_IGNORE( DoShowConnectionChangedDlgL() ); |
1642 } |
1642 } |
1643 |
1643 |
1644 //------------------------------------------------------------------------ |
1644 //------------------------------------------------------------------------ |
|
1645 //CInternetConnectionManager::CancelConnection |
|
1646 // |
|
1647 void CInternetConnectionManager::CancelConnection() |
|
1648 { |
|
1649 if(iSyncConnector && iSyncConnector->IsActive()) |
|
1650 { |
|
1651 iSyncConnector->Cancel(); |
|
1652 } |
|
1653 } |
|
1654 |
|
1655 //------------------------------------------------------------------------ |
1645 //CInternetConnectionManager::AskIap |
1656 //CInternetConnectionManager::AskIap |
1646 //------------------------------------------------------------------------ |
1657 //------------------------------------------------------------------------ |
1647 EXPORT_C TInt CInternetConnectionManager::AskIap( TUint32& aNewIap ) |
1658 EXPORT_C TInt CInternetConnectionManager::AskIap( TUint32& aNewIap ) |
1648 { |
1659 { |
1649 CLOG_ENTERFN("AskIap"); |
1660 CLOG_ENTERFN("AskIap"); |
1998 CLOG_WRITE( "Fully initialized" ); |
2009 CLOG_WRITE( "Fully initialized" ); |
1999 iInitialized = ETrue; |
2010 iInitialized = ETrue; |
2000 } |
2011 } |
2001 |
2012 |
2002 //------------------------------------------------------------------------ |
2013 //------------------------------------------------------------------------ |
2003 //CInternetConnectionManager::ConnectWithSnapId |
2014 //CInternetConnectionManager::ConnectWithSnapIdL |
2004 //------------------------------------------------------------------------ |
2015 //------------------------------------------------------------------------ |
2005 TInt CInternetConnectionManager::ConnectWithSnapId(TUint32 aRequestedSnapId) |
2016 TInt CInternetConnectionManager::ConnectWithSnapIdL(TUint32 aRequestedSnapId) |
2006 { |
2017 { |
2007 |
2018 |
2008 CLOG_WRITE_1( "CInternetConnectionManager::ConnectWithSnapId - %d", aRequestedSnapId ); |
2019 CLOG_WRITE_1( "CInternetConnectionManager::ConnectWithSnapId - %d", aRequestedSnapId ); |
2009 |
2020 |
2010 iInternalError = KErrNone; |
2021 iInternalError = KErrNone; |