--- a/hotspotfw/hsclient/NetCfgExtnHotSpot/src/NetCfgExtnHotSpot.cpp	Fri May 14 16:56:58 2010 +0300
+++ b/hotspotfw/hsclient/NetCfgExtnHotSpot/src/NetCfgExtnHotSpot.cpp	Thu May 27 13:59:00 2010 +0300
@@ -18,6 +18,7 @@
 
 // INCLUDE FILES
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <es_sock_partner.h>
 #include <nifman_internal.h>
 #endif
 #include "NetCfgExtnHotSpot.h"

--- a/hotspotfw/rom/hotspot.iby	Fri May 14 16:56:58 2010 +0300
+++ b/hotspotfw/rom/hotspot.iby	Thu May 27 13:59:00 2010 +0300
@@ -27,7 +27,6 @@
 
 #ifdef __PROTOCOL_WLAN
 
-*** DLLs
 file=ABI_DIR\BUILD_DIR\hotspotclient.dll        SHARED_LIB_DIR\hotspotclient.dll
 file=ABI_DIR\BUILD_DIR\ictsclientinterface.dll  SHARED_LIB_DIR\ictsclientinterface.dll
 

--- a/wlanutilities/wlanindicatorplugin/src/wlanindicatorplugin.cpp	Fri May 14 16:56:58 2010 +0300
+++ b/wlanutilities/wlanindicatorplugin/src/wlanindicatorplugin.cpp	Thu May 27 13:59:00 2010 +0300
@@ -197,9 +197,7 @@
                     }
 
             else if (indicatorText[0] == wlanConnected){
-                QString iapName = indicatorText[1].toString();                                        
-                QString str = QString(hbTrId("txt_occ_dblist_wireless_lan_val_1_connected"));
-                qvariant = str.arg(iapName);
+                qvariant = indicatorText[1].toString();
                 }
             }            
         else 
@@ -214,14 +212,14 @@
         if (mParameter.isValid() && mParameter.type() == QVariant::List) {
             indicatorText = mParameter.toList();
             if ((indicatorText.size() > 0) && (indicatorText[0] == wlanConnected)) {
-                qvariant = HbIcon("qtg_status_wlan");
+                qvariant = QString("qtg_status_wlan");
             }
         }
         break;
         // this is the icon in the indicator
     case DecorationNameRole:
         OstTraceFunctionExit1(DUP2_WLANINDICATORPLUGIN_INDICATORDATA_EXIT, this);
-        qvariant = HbIcon("qtg_small_wlan");
+        qvariant = QString("qtg_small_wlan");
         break;
     default:
         OstTraceFunctionExit1(DUP3_WLANINDICATORPLUGIN_INDICATORDATA_EXIT, this);

--- a/wlanutilities/wlanqtutilities/wlanqtutilities.pro	Fri May 14 16:56:58 2010 +0300
+++ b/wlanutilities/wlanqtutilities/wlanqtutilities.pro	Thu May 27 13:59:00 2010 +0300
@@ -25,6 +25,12 @@
 #Store generated .moc files to their own directory
 MOC_DIR = moc
 
+# Temporary solution to fix tracecompiler
+# When tracecompiler is fixed, this can be removed
+symbian: {
+    MMP_RULES += "USERINCLUDE traces"
+}
+
 #Following macros MW_LAYER_SYSTEMINCLUDE and OS_LAYER_SYSTEMINCLUDE are defined 
 #in X:\QT\mkspecs\features\symbian\platform_paths.prf that is always inluded in
 #QT compilation

--- a/wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsconmonwrapper_s60_p.h	Fri May 14 16:56:58 2010 +0300
+++ b/wlanutilities/wlanqtutilities/wrapper/inc/wlanqtutilsconmonwrapper_s60_p.h	Thu May 27 13:59:00 2010 +0300
@@ -198,6 +198,8 @@
      */
     static WlanQtUtilsBearerType connMon2WlanQtUtilsBearerTypeMap(TInt aBearerType);
 
+    bool isWlan(uint connectionId);
+
 private:
     // Data
 

--- a/wlanutilities/wlanqtutilities/wrapper/src/wlanqtutilsconmonwrapper_s60.cpp	Fri May 14 16:56:58 2010 +0300
+++ b/wlanutilities/wlanqtutilities/wrapper/src/wlanqtutilsconmonwrapper_s60.cpp	Thu May 27 13:59:00 2010 +0300
@@ -298,6 +298,11 @@
         CONNMONCONNINFO_EVENTL_EVENTTYPE,
         "ConnMonConnInfo::EventL;connectionId=%u;aConnMonEvent.EventType()=%d", connectionId, aConnMonEvent.EventType() );
 
+    // Filter out other than WLAN connections
+    if (!isWlan(connectionId)) {
+        return;
+    }
+    
     // Note: Conversions from CConnMonEventBase to sub classes cannot be made to use dynamic_cast
     // because constructors of CConnMonEventBase and its sub classes are not public in
     // connmon library's interface.
@@ -528,6 +533,36 @@
     return connUtilsBearerType;
     }
 
+/*!
+    Checks the bearer of given connection.
+    Meant for filtering handling only for WLAN IAP's.
+    
+    @param [in] connectionId Connection ID.
+    
+    @return Returns true if connection a WLAN connection, otherwise false. 
+*/
+
+bool ConnMonConnInfo::isWlan(uint connectionId)
+{
+    bool result = false;
+    TRequestStatus status;
+
+    TInt bearer = 0;
+    iMonitor.GetIntAttribute(
+        connectionId,
+        0,
+        KBearer,
+        bearer,
+        status);
+    User::WaitForRequest(status);
+
+    if (status.Int() == KErrNone && bearer == EBearerWLAN) {
+        result = true;
+    }
+    
+    return result;
+}
+
 // ---------------------------------------------------------
 // ConnMonConnDisconnect::ConnMonConnDisconnect()
 // Constructor
@@ -629,5 +664,3 @@
 
     OstTraceFunctionExit1( CONNMONCONNDISCONNECT_DISCONNECTCONNECTION_EXIT, this );
     }
-
-//end of file