equal
deleted
inserted
replaced
24 #include <utf.h> |
24 #include <utf.h> |
25 #include <stringresourcereader.h> |
25 #include <stringresourcereader.h> |
26 #include <barsread.h> |
26 #include <barsread.h> |
27 #include <NSmlDSProvisioningAdapter.rsg> |
27 #include <NSmlDSProvisioningAdapter.rsg> |
28 #include <bautils.h> |
28 #include <bautils.h> |
29 #include <ApUtils.h> |
|
30 #include <barsc.h> |
29 #include <barsc.h> |
31 |
30 #include <cmconnectionmethoddef.h> |
|
31 #include <cmmanagerext.h> |
32 #include <nsmlconstants.h> |
32 #include <nsmlconstants.h> |
33 #include <nsmldebug.h> |
33 #include <nsmldebug.h> |
34 #include <nsmldsconstants.h> |
34 #include <nsmldsconstants.h> |
35 #include <CWPCharacteristic.h> |
35 #include <CWPCharacteristic.h> |
36 #include <CWPParameter.h> |
36 #include <CWPParameter.h> |
260 |
260 |
261 else |
261 else |
262 { |
262 { |
263 uid.Copy(iProfiles[aItem]->iVisitParameter->Data() ); |
263 uid.Copy(iProfiles[aItem]->iVisitParameter->Data() ); |
264 |
264 |
265 CCommsDatabase* commDb = CCommsDatabase::NewL(); |
265 RCmManagerExt cmmanagerExt; |
266 CleanupStack::PushL(commDb); |
266 cmmanagerExt.OpenL(); |
267 CApUtils* aputils = CApUtils::NewLC( *commDb); |
267 CleanupClosePushL(cmmanagerExt); |
268 |
268 RCmConnectionMethodExt cm; |
269 TRAP( ERROR, apId = aputils->IapIdFromWapIdL( uid() ) ); |
269 cm = cmmanagerExt.ConnectionMethodL( uid()); |
270 CleanupStack::PopAndDestroy(2); //commdb, aputils |
270 CleanupClosePushL( cm ); |
|
271 |
|
272 TRAP( ERROR, apId = cm.GetIntAttributeL(CMManager::ECmIapId) ); |
|
273 CleanupStack::PopAndDestroy(2); //cmmanager,cm |
271 } |
274 } |
272 |
275 |
273 //Get default access point in failure of getting AP |
276 //Get default access point in failure of getting AP |
274 if (ERROR != KErrNone || err1 != KErrNone) |
277 if (ERROR != KErrNone || err1 != KErrNone) |
275 { |
278 { |