--- a/wlanutilities/wlansniffer/aiplugin/src/wsfaicontroller.cpp	Wed Jun 09 10:53:40 2010 +0300
+++ b/wlanutilities/wlansniffer/aiplugin/src/wsfaicontroller.cpp	Mon Jun 21 16:55:05 2010 +0300
@@ -80,8 +80,7 @@
     iAiModel( NULL ),
     iUi( NULL ),
     iDbObserver( NULL ),
-    iShouldConnectOnly( EFalse ),
-    iTestAccessPoint( EFalse )
+    iConnectOnly( EFalse )
     {
     // null the pointers
     iConnectedWlan.iConnectionState = ENotConnected;
@@ -461,14 +460,10 @@
     if ( aResult == KErrNone )
         {
         iAiModel->SetConnected( ETrue );
-        if ( !iShouldConnectOnly )
+        if ( !iConnectOnly )
             {
             StartWebBrowserL( iUsedInfo );
             }
-        if ( iTestAccessPoint )
-            {
-            iModel->TestConnectedAccessPointL( iUsedInfo, iShouldConnectOnly );
-            }
         }
     else
         {
@@ -511,7 +506,7 @@
     else
         {
         LOG_WRITE("Start browser to connected network...");
-        iShouldConnectOnly = EFalse;
+        iConnectOnly = EFalse;
         StartWebBrowserL( iUsedInfo );
         }
     
@@ -558,8 +553,8 @@
     LOG_ENTERFN( "TWsfAiController::ConnectL" );
     
     _ASS_D( iModel );
-    iTestAccessPoint = aTestAccessPoint;
-    iShouldConnectOnly = aConnectOnly;
+    TBool testAccessPoint = aTestAccessPoint;
+    iConnectOnly = aConnectOnly;
     iUsedInfo = aInfo;
     
     // Prevent connections to ad-hoc + WPA 
@@ -602,29 +597,31 @@
             User::Leave( accessPointCreatedError );
             }
         ConnectingL( iUsedInfo.iIapId );
-        iTestAccessPoint = ETrue;
+        testAccessPoint = ETrue;
         }
     else if ( !iUsedInfo.iIapId )
         {
+        testAccessPoint = ETrue;
         // let the helper app do the query if necessary
         LOG_WRITE("AiHelper needs to be launched");
-        iTestAccessPoint = ETrue;
         iActiveWrappers->LaunchHelperApplicationL( iUsedInfo, 
-                                                   iShouldConnectOnly,
-                                                   iTestAccessPoint );
+                                                   iConnectOnly,
+                                                   testAccessPoint );
         }
     
     // Connect
     if ( iUsedInfo.iIapId )
         {
-        if ( iTestAccessPoint )
+        if ( testAccessPoint )
             {
-            iActiveWrappers->Connect( iUsedInfo.iIapId, EIapExpireOnDisconnect );
+            iActiveWrappers->Connect( iUsedInfo.iIapId, iConnectOnly, 
+                                      EIapExpireOnDisconnect );
             
             }
         else
             {
-            iActiveWrappers->Connect( iUsedInfo.iIapId, EIapPersistent );
+            iActiveWrappers->Connect( iUsedInfo.iIapId, iConnectOnly, 
+                                      EIapPersistent );
             }
         }
     // pop cleanup item