diff -r 8b0eae1b1d71 -r 981afc7d3841 wlanutilities/wlansniffer/aiplugin/src/wsfaicontroller.cpp
--- a/wlanutilities/wlansniffer/aiplugin/src/wsfaicontroller.cpp	Mon Mar 15 12:44:54 2010 +0200
+++ b/wlanutilities/wlansniffer/aiplugin/src/wsfaicontroller.cpp	Wed Mar 31 23:17:49 2010 +0300
@@ -66,12 +66,7 @@
 //  LOCAL DEFINITIONS
 LOCAL_D const TInt KFirstItemArrayIndex = 0;
 
-// Category UID of AiHelper property
-static const TUid KWsfAiHelperCategoryUid = { 0x10281CEB };
-
-// key numbers within the property 
-static const TUint KWsfAiHelperExitCodeKey = 0;
-static const TUint KWsfAiHelperIapIdKey = 1;
+// index value to suppress 1 second refreshing state
 static const TInt KSuppressRefreshIndex = 1024;
 
 
@@ -227,9 +222,6 @@
     
     MDesCArray* data = iAiModel->FormatSingleLineWlanListL( iInfoArray );
     
-    // index value to suppress 1 second refreshing state
-    const TInt KSuppressRefreshIndex = 1024;
-    
     iUi->UpdateHotSpotsL( data, KSuppressRefreshIndex );    
     }
 
@@ -292,20 +284,6 @@
 
 
 // --------------------------------------------------------------------------
-// TWsfAiController::DismissDialogsL
-// --------------------------------------------------------------------------
-//
-void TWsfAiController::DismissDialogsL()
-    {
-    LOG_ENTERFN("TWsfAiController::DismissDialogsL" );
-    TKeyEvent key;
-    key.iCode = EKeyEscape;
-    key.iModifiers = 0;
-    iEnv->SimulateKeyEventL( key, EEventKey );
-    }
-
-
-// --------------------------------------------------------------------------
 // TWsfAiController::WlanListChangedL
 // --------------------------------------------------------------------------
 //
@@ -528,7 +506,7 @@
     
     if ( !iUsedInfo.Connected() )
         {
-        ConnectL( iUsedInfo, EFalse );
+        ConnectL( iUsedInfo, EFalse, EFalse );
         }
     else
         {
@@ -574,13 +552,14 @@
 // TWsfAiController::ConnectL
 // --------------------------------------------------------------------------
 //
-void TWsfAiController::ConnectL( TWsfWlanInfo& aInfo, TBool aShoulConnectOnly )
+void TWsfAiController::ConnectL( TWsfWlanInfo& aInfo, TBool aConnectOnly, 
+                                 TBool aTestAccessPoint )
     {
     LOG_ENTERFN( "TWsfAiController::ConnectL" );
     
     _ASS_D( iModel );
-    iTestAccessPoint = EFalse;
-    iShouldConnectOnly = aShoulConnectOnly;
+    iTestAccessPoint = aTestAccessPoint;
+    iShouldConnectOnly = aConnectOnly;
     iUsedInfo = aInfo;
     
     // Prevent connections to ad-hoc + WPA 
@@ -629,9 +608,10 @@
         {
         // let the helper app do the query if necessary
         LOG_WRITE("AiHelper needs to be launched");
-        LaunchAiHelperAppL( iUsedInfo );
-        ConnectingL( iUsedInfo.iIapId );
         iTestAccessPoint = ETrue;
+        iActiveWrappers->LaunchHelperApplicationL( iUsedInfo, 
+                                                   iShouldConnectOnly,
+                                                   iTestAccessPoint );
         }
     
     // Connect
@@ -646,7 +626,6 @@
             {
             iActiveWrappers->Connect( iUsedInfo.iIapId, EIapPersistent );
             }
-
         }
     // pop cleanup item 
     CleanupStack::Pop();
@@ -668,54 +647,6 @@
 
 
 // --------------------------------------------------------------------------
-// TWsfAiController::LaunchAiHelperAppL
-// --------------------------------------------------------------------------
-//
-void TWsfAiController::LaunchAiHelperAppL( TWsfWlanInfo& aInfo )
-    {
-    LOG_ENTERFN( "TWsfAiController::LaunchAiHelperAppL" );
-
-    CWsfActiveWaiter* waiter = CWsfActiveWaiter::NewL();
-    CleanupStack::PushL( waiter );
-    
-    RProperty aiHelperApp;
-    User::LeaveIfError( aiHelperApp.Attach( 
-                                       KWsfAiHelperCategoryUid, 
-                                       KWsfAiHelperExitCodeKey ) );
-    CleanupClosePushL( aiHelperApp );
-    
-    aiHelperApp.Subscribe( waiter->iStatus );
-
-    LOG_WRITE("launching...");
-    iModel->LaunchHelperApplicationL( aInfo, ETrue, EFalse );
-    waiter->WaitForRequest();
-    
-    TInt exitCode( KErrNone );
-    aiHelperApp.Get( exitCode );
-    
-    LOG_WRITEF("AiHelper returned %d", exitCode );   
-    
-    if ( exitCode == KErrNone )
-        {
-        User::LeaveIfError( aiHelperApp.Attach( 
-                                       KWsfAiHelperCategoryUid, 
-                                       KWsfAiHelperIapIdKey ) );
-        TInt iapId( 0 );
-        aiHelperApp.Get( iapId );
-        aInfo.iIapId = TUint32( iapId );
-        LOG_WRITEF("AiHelper iap id = %d", iapId );
-        }
-    else
-        {
-        User::Leave( exitCode );
-        }
-    
-    CleanupStack::PopAndDestroy( &aiHelperApp );
-    CleanupStack::PopAndDestroy( waiter );
-    }
-
-
-// --------------------------------------------------------------------------
 // TWsfAiController::ContinueBrowsingL
 // --------------------------------------------------------------------------
 //
@@ -1092,13 +1023,14 @@
                 
                 if ( LaunchSearchDialogL( info ) )
                     {
-                    ConnectL( info, ETrue );
+                    ConnectL( info, ETrue, EFalse );
                     }
                 }
             else
                 {
                 // there are known networks
-                ConnectL( *wlanArray->At( KFirstItemArrayIndex ), ETrue );
+                ConnectL( *wlanArray->At( KFirstItemArrayIndex ), ETrue, 
+                          EFalse );
                 }
             
             break;
@@ -1120,7 +1052,7 @@
             
             if ( LaunchSearchDialogL( info ) )
                 {
-                ConnectL( info, ETrue );
+                ConnectL( info, ETrue, EFalse );
                 }
 
             break;
@@ -1243,8 +1175,15 @@
 void TWsfAiController::RefreshRefreshingL()
 	{
 	LOG_ENTERFN( "TWsfAiController::RefreshRefreshingL" );
-	MDesCArray *data = iAiModel->FormatRefreshingL();
-    iUi->UpdateViewL( data );
+	if ( !iUi->MultilineControl() )
+	    {
+        MDesCArray *data = iAiModel->FormatRefreshingL();
+        iUi->UpdateViewL( data );
+	    }
+	else
+	    {
+        LOG_WRITE( "Multiline control in use - no update done" );
+	    }
 	}
 
 // --------------------------------------------------------------------------
@@ -1254,8 +1193,15 @@
 void TWsfAiController::RefreshConnectingL()
     {
     LOG_ENTERFN( "TWsfAiController::RefreshConnectingL" );
-    MDesCArray *data = iAiModel->FormatConnectingL();
-    iUi->UpdateViewL( data );
+    if ( !iUi->MultilineControl() )
+        {
+        MDesCArray *data = iAiModel->FormatConnectingL();
+        iUi->UpdateViewL( data );
+        }
+    else       
+        {
+        LOG_WRITE( "Multiline control in use - no update done" );
+        }
     }
 
 // End of file