--- a/dbcreator/commsdatcreator/Src/cdccommsdatcreator.cpp Thu May 13 23:17:48 2010 +0300
+++ b/dbcreator/commsdatcreator/Src/cdccommsdatcreator.cpp Fri May 14 10:52:16 2010 +0300
@@ -150,8 +150,6 @@
CLOG_WRITE( "Processing started...\n" )
CLOG_WRITE( "=====================\n" )
- iCmManager.OpenL();
-
TDbCreatorInputCharSet charSet( ECharSetUnknown );//input character set
//Creates access points
@@ -325,7 +323,7 @@
// Updates the IAPs that are not in destinations.
- UpdateUncatCmsL( iCmInDest /*, iPluginNames, iPluginArray*/ );
+ UpdateUncatCmsL( iCmInDest );
// Sets the underlying IAP/SNAPS for vpn IAPs
SetUnderlyingIapL( iUnderLying );
@@ -349,9 +347,6 @@
// Sets linger settings
SetLingerSettingsL( iLingerSettings );
- // Sets the default connection
-// SetDefaultConnectionL( iDefCon );
-
// Logs IAPs in UDEB mode
#ifdef _DEBUG
LogIapIdsL();
@@ -435,7 +430,9 @@
FeatureManager::InitializeLibL();
iIsWlanS = FeatureManager::FeatureSupported( KFeatureIdProtocolWlan );
FeatureManager::UnInitializeLib();
- CLOG_WRITE( "FeatureManager closed\n" )
+ CLOG_WRITE( "FeatureManager closed\n" )
+
+ iCmManager.OpenL();
}
//------------------------------------------------
@@ -583,34 +580,6 @@
}
}
-// ---------------------------------------------------------
-// CCdcCommsDatCreator::ProcessDNL
-// ---------------------------------------------------------
-//
-/*void CCdcCommsDatCreator::SetDefaultConnectionL( RPointerArray< HBufC >& aDefCon )
- {
- // Sets the default connection
- if( aDefCon.Count() > 0 )
- {
- CLOG_WRITE_FORMAT( "SetDefaultConnectionL: %d\n", aDefCon.Count() )
- CLOG_WRITE( "--------------------------------------\n" )
-
- CProcessorGlobal* glb = CProcessorGlobal::NewL( iReader,
- iCmManager,
- iPluginArray,
- iPluginNames,
- iDestArray,
- iDestNames,
- aDefCon );
-
- CleanupStack::PushL( glb );
- glb->SetDefaultConnectionL();
-
- CleanupStack::PopAndDestroy( glb );
-
- CLOG_WRITE( "--------------------------------------\n" )
- }
- }*/
// ---------------------------------------------------------
// CCdcCommsDatCreator::SetUnderlyingIapL