engine/src/ConnectionEngine.cpp
branch3rded
changeset 177 269e3f3e544a
parent 176 1c8b56cb6409
--- a/engine/src/ConnectionEngine.cpp	Sat Jul 10 13:35:21 2010 +0100
+++ b/engine/src/ConnectionEngine.cpp	Sun Jul 11 11:36:24 2010 +0100
@@ -61,8 +61,8 @@
 //		iMobility = CActiveCommsMobilityApiExt::NewL( iConnection, *this );
 //		}
 //	
-//	iConnectionState = iStatus.Int() == KErrNone?CConnectionEngine::EConnected:CConnectionEngine::ENotConnected;
-//	ReportConnectionL( iStatus.Int() );
+	iConnectionState = iStatus.Int() == KErrNone?CConnectionEngine::EConnected:CConnectionEngine::ENotConnected;
+	ReportConnectionL( iStatus.Int() );
 	}
 
 void CConnectionEngine::DoCancel()
@@ -149,12 +149,13 @@
 	
 	iConnection.Close();
 	User::LeaveIfError( iConnection.Open( iSocketServer ) );
-//	// Connect using UI Setting
-//	if(aConnectionType == EDefaultConnection)
-//		{
-//		iConnection.Start( iStatus );
-//		SetActive();
-//		}
+
+	// Connect using UI Setting
+	if(aConnectionType == EDefaultConnection || EUserSelectConnection)
+		{
+		iConnection.Start( iStatus );
+		SetActive();
+		}
 //	else if(aConnectionType == EUserSelectConnection)
 //		{				
 //		TBool selected = ConnectionSettingL();
@@ -186,14 +187,14 @@
 //		
 //			SetActive();
 //		}	
-//	else if (aConnectionType == EIAPConnection)
-//		{
-//		iCommdbPreference.SetIapId((iPodcastModel.SettingsEngine().SpecificIAP()& KUseIAPMask));
-//		iCommdbPreference.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-//		iCommdbPreference.SetDirection(ECommDbConnectionDirectionOutgoing);
-//		iConnection.Start( iCommdbPreference, iStatus );
-//		SetActive();
-//		}
+	else if (aConnectionType == EIAPConnection)
+		{
+		iCommdbPreference.SetIapId((iPodcastModel.SettingsEngine().SpecificIAP()& KUseIAPMask));
+		iCommdbPreference.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
+		iCommdbPreference.SetDirection(ECommDbConnectionDirectionOutgoing);
+		iConnection.Start( iCommdbPreference, iStatus );
+		SetActive();
+		}
 //	// Connect using SNAP 
 //	else
 //		{