# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1274784812 -10800
# Node ID 024ee8b21fe252faad8f072409b33af79cb5e274
# Parent  61c93568468dcb574bef8ab968385aa7ac99490c
Revision: 201019
Kit: 2010121

diff -r 61c93568468d -r 024ee8b21fe2 hotspotfw/hsclient/NetCfgExtnHotSpot/src/NetCfgExtnHotSpot.cpp
--- a/hotspotfw/hsclient/NetCfgExtnHotSpot/src/NetCfgExtnHotSpot.cpp	Tue May 11 17:14:21 2010 +0300
+++ b/hotspotfw/hsclient/NetCfgExtnHotSpot/src/NetCfgExtnHotSpot.cpp	Tue May 25 13:53:32 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"
diff -r 61c93568468d -r 024ee8b21fe2 wlanutilities/wlanindicatorplugin/src/wlanindicatorpluginimplementation.cpp
--- a/wlanutilities/wlanindicatorplugin/src/wlanindicatorpluginimplementation.cpp	Tue May 11 17:14:21 2010 +0300
+++ b/wlanutilities/wlanindicatorplugin/src/wlanindicatorpluginimplementation.cpp	Tue May 25 13:53:32 2010 +0300
@@ -30,6 +30,7 @@
 #include <rconnmon.h>
 #include <cmmanager.h>
 #include <cmconnectionmethod.h>
+#include <cmpluginwlandef.h>
 #include <utf.h>
 #include <wlanindicator.rsg>
 #include "wlanindicatorpluginimplementation.h"
@@ -244,7 +245,15 @@
     RCmConnectionMethod connMethod = cmManager.ConnectionMethodL( connectedIapId );  
     CleanupClosePushL( connMethod );
     
-    connName = connMethod.GetStringAttributeL( ECmName );
+    TUint32 easyWLANIapId = cmManager.EasyWlanIdL();
+    if ( easyWLANIapId != connectedIapId )
+        {
+        connName = connMethod.GetStringAttributeL( ECmName );
+        }
+    else
+        {
+        connName = connMethod.GetStringAttributeL( EWlanUsedSSID );
+        }
         
     CleanupStack::PopAndDestroy( 2, &cmManager ); //cmManager and connMethod
     
diff -r 61c93568468d -r 024ee8b21fe2 wlanutilities/wlansniffer/mainapplication/src/wsfappui.cpp
--- a/wlanutilities/wlansniffer/mainapplication/src/wsfappui.cpp	Tue May 11 17:14:21 2010 +0300
+++ b/wlanutilities/wlansniffer/mainapplication/src/wsfappui.cpp	Tue May 25 13:53:32 2010 +0300
@@ -247,7 +247,7 @@
 
 
 // ---------------------------------------------------------------------------
-// CWsfAppUi::HandleCommandL
+// CWsfAppUi::HandleForegroundEventL
 // ---------------------------------------------------------------------------
 //
 void CWsfAppUi::HandleForegroundEventL( TBool aForeground )
@@ -256,6 +256,17 @@
     //Application switched to foreground.
     if ( aForeground )
         {
+        CWsfMainView* mainView = static_cast<CWsfMainView*>( 
+                                            View( TUid::Uid( EMainViewId ) ) );
+        if ( mainView )
+            {
+            TRAPD( err, mainView->UpdateBrowserUsageInfoL() );
+            if ( err )
+                {
+                LOG_WRITEF( "Browser iap usage update failed - err=%d", err );
+                }
+            }
+    
         if ( iObserver )
             {
             iObserver->AppSwitchedForegroundL();