--- a/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistview.cpp	Wed Jun 23 19:25:42 2010 +0300
+++ b/wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistview.cpp	Tue Jul 06 15:29:22 2010 +0300
@@ -91,12 +91,6 @@
 {
     OstTraceFunctionEntry0(WLANSNIFFERLISTVIEW_WLANSNIFFERLISTVIEW_ENTRY);
 
-    // Start scanning immediately to get the first scan results as soon as
-    // possible, since the scanning takes time.
-    if (mEngine->masterWlan() && !mEngine->forceDisableWlan()) {
-        mEngine->startWlanScanning();
-    }
-    
     // Initialize UI from the docml based on standalone/embedded status
     loadDocml(mEngine->isEmbedded());
 
@@ -172,6 +166,14 @@
         SLOT(handleWlanToggled()));
     Q_ASSERT(connectStatus);
 
+    // Connect adding WLAN manually
+    connectStatus = connect(
+        mAddWlanAction,
+        SIGNAL(triggered(bool)),
+        this,
+        SLOT(startWlanWizard()));
+    Q_ASSERT(connectStatus);
+    
     // Connect WLAN scan results signal
     connectStatus = connect(
         mEngine,
@@ -631,6 +633,21 @@
 }
 
 /*!
+    Function for handling WLAN Wizard starting when adding WLAN manually.
+*/
+
+void WlanSnifferListView::startWlanWizard()
+{
+    OstTraceFunctionEntry0(WLANSNIFFERLISTVIEW_STARTWLANWIZARD_ENTRY);
+
+    // TODO: Stop connections & do other cleanup before wizard can start? 
+
+    emit wizardTriggered(NULL);
+
+    OstTraceFunctionExit0(WLANSNIFFERLISTVIEW_STARTWLANWIZARD_EXIT);
+}
+
+/*!
     Function to handle the input received when the wlan enabling 
     query is closed.