--- a/vpnui/vpnmanagementui/src/vpnmanagementuiserversettingsview.cpp Mon Jun 21 16:49:56 2010 +0300
+++ b/vpnui/vpnmanagementui/src/vpnmanagementuiserversettingsview.cpp Thu Aug 19 10:54:34 2010 +0300
@@ -116,11 +116,9 @@
// Handles Softkey and Options list commands
// ---------------------------------------------------------
//
-void CServerSettingsView::HandleCommandL( TInt /* aCommand */)
+void CServerSettingsView::HandleCommandL( TInt aCommand)
{
- /*** NSSM support is discontinued.
- Code is kept in comments temporarily because similar UI functionality
- might be needed for another purpose.
+
TBool ffs(EFalse);
switch ( aCommand )
{
@@ -129,7 +127,7 @@
//GET CURRENT ADDRESS
ASSERT( iContainer );
- const TAcuApiServerDetails& serverDetails = iContainer->ServerDetailsL();
+ const TAgileProvisionApiServerSettings& serverDetails = iContainer->ServerDetailsL();
ffs = iLoader.FFSSpaceBelowCriticalLevelL( ETrue, 0 );
if (ffs)
@@ -149,20 +147,11 @@
}
else
{
- TBool createServer = ETrue;
- if(createServer)
- {
- //Creating a new VPN policy server
- if( iContainer->ServerIndex() == -1)
- {
- int aResult = iLoader.AcuApiWrapperL().CreateServer(serverDetails);
+
+ int aResult = iLoader.VpnApiWrapperL().CreateServer(serverDetails);
if (aResult == KErrNone)
{
- //Update iServerList of CAcuApiWrapper
- //After that we can call Synchronise server from
- //CVpnManagementUiPolicyContainer::ActivateL()
-
- iLoader.AcuApiWrapperL().ServerListL();
+
iLoader.iNewServerDefinition = ETrue;
}
@@ -171,23 +160,16 @@
iLoader.iShowDefineQuery = EFalse;
iLoader.iBackFromServerDefinition = ETrue;
iLoader.iNewServerDefinition = EFalse;
- createServer = EFalse;
CErrorUI* errorUi = CErrorUI::NewLC( *(CCoeEnv::Static()) );
errorUi->ShowGlobalErrorNoteL( aResult );
CleanupStack::PopAndDestroy(); // errorUi
}
- }
- //Editing an existing policy server
- else
- {
- iLoader.AcuApiWrapperL().SaveServerDetails(serverDetails);
- }
+
}
iLoader.ChangeViewL( KChangeViewPrevious );
- }
- break;
+ break;
}
case EAknCmdExit:
{
@@ -214,7 +196,7 @@
AppUi()->HandleCommandL( aCommand );
break;
}
- } ***/
+ }
}
// ---------------------------------------------------------