--- a/wlanutilities/wlansniffer/aiplugin/src/wsfaiplugin.cpp	Fri Feb 19 23:55:42 2010 +0200
+++ b/wlanutilities/wlansniffer/aiplugin/src/wsfaiplugin.cpp	Fri Mar 12 15:48:54 2010 +0200
@@ -46,6 +46,7 @@
 #include "wsficonarraycreator.h"
 #include "wsfdbobserver.h"
 #include "wsflogger.h"
+#include "wsfactivewrappers.h"
 
 
 // define icon id for Navigation Bar icon
@@ -80,6 +81,7 @@
 //
 CWsfAiPlugin::~CWsfAiPlugin()
     {
+    LOG_ENTERFN( "CWsfAiPlugin::~CWsfAiPlugin" );
     // Cancel periodic animation update
     if ( iAnimationPeriodic )
         {
@@ -91,14 +93,7 @@
     
     delete iDbObserver;
     
-    // Cancel start up refresh
-    if ( iStartupRefresh )
-        {
-        LOG_WRITE( "Cancel start up refresh" );
-        iStartupRefresh->Cancel();
-        delete iStartupRefresh;
-        iStartupRefresh = NULL;
-        }
+    delete iActiveWrappers;
     
     delete iModel;
     delete iAiModel;
@@ -164,12 +159,15 @@
     // then model
     iAiModel = CWsfAiModel::NewL();
     iUi = CWsfAiView::NewL( *this );
-    iStartupRefresh = new (ELeave) CAsyncCallBack( 
-                                          TCallBack( StartupRefresh, this ), 
-                                          CActive::EPriorityIdle );
+    
     iDbObserver = CWsfDbObserver::NewL();
+    
+    iActiveWrappers = CWsfActiveWrappers::NewL( iModel, iController );
+    
     iController.SetUi( *static_cast<CWsfAiView*>( iUi ) );
-    iController.InitializeL( iModel, iAiModel, iDbObserver );
+    
+    iController.InitializeL( iModel, iAiModel, iDbObserver, 
+							 iActiveWrappers );
     }
 
 
@@ -419,7 +417,7 @@
 void CWsfAiPlugin::Start( TStartReason /*aReason*/ )
     {
     LOG_ENTERFN( "CWsfAiPlugin::Start");
-    iStartupRefresh->CallBack();
+    iController.StartupRefresh();
     }
 
 // --------------------------------------------------------------------------
@@ -452,7 +450,7 @@
         if ( !iAiModel->Connected() && !iModel->IsConnecting() )
             {
             LOG_WRITE( "Call Refresh scan" );
-            TRAP_IGNORE( iModel->RefreshScanL() );
+        	iActiveWrappers->RefreshScan();
             }
         else
             {
@@ -864,32 +862,6 @@
 
 
 // ---------------------------------------------------------------------------
-// CWsfAiPlugin::StartupRefresh
-// ---------------------------------------------------------------------------
-//
-TInt CWsfAiPlugin::StartupRefresh( TAny* aPtr )
-    {
-    LOG_ENTERFN( "CWsfAiPlugin::StartupRefresh" );
-    CWsfAiPlugin* self = static_cast<CWsfAiPlugin*>( aPtr );
-    TRAP_IGNORE( self->StartupRefreshL(); );
-    
-    return 0;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CWsfAiPlugin::StartupRefreshL
-// ---------------------------------------------------------------------------
-//
-TInt CWsfAiPlugin::StartupRefreshL()
-    {
-    LOG_ENTERFN( "CWsfAiPlugin::StartupRefresh" );
-    iController.StartupRefreshL();
-    
-    return 0;
-    }
-
-// ---------------------------------------------------------------------------
 // CWsfAiPlugin::DoRefreshingStepL
 // ---------------------------------------------------------------------------
 //