# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1272882771 -10800
# Node ID 498f361161400ea43218d11905aeb2756c6ec21e
# Parent  10810c91db26f49a4643277fce91870fe1ec505a
Revision: 201015
Kit: 201018

diff -r 10810c91db26 -r 498f36116140 hotspotfw/hsclient/src/hssiaphandler.cpp
--- a/hotspotfw/hsclient/src/hssiaphandler.cpp	Fri Apr 16 16:07:56 2010 +0300
+++ b/hotspotfw/hsclient/src/hssiaphandler.cpp	Mon May 03 13:32:51 2010 +0300
@@ -98,10 +98,11 @@
     CleanupClosePushL( cmManager );
     
     TUint easyWlanId = cmManager.EasyWlanIdL();
+    
     // Easy WLAN can't be modified
     if ( easyWlanId == aIapID )
     	{
-    	cmManager.Close();
+        CleanupStack::PopAndDestroy( &cmManager ); 
     	return KErrPermissionDenied;
     	}
     
@@ -117,8 +118,8 @@
         plugin.SetStringAttributeL( ECmName, aSettings.Name );
         plugin.UpdateL();
         }
-    CleanupStack::PopAndDestroy( &plugin ); // Close() called on "plugin"
-    CleanupStack::PopAndDestroy( &cmManager ); // Close() called on "cmManager"
+    CleanupStack::PopAndDestroy( &plugin ); 
+    CleanupStack::PopAndDestroy( &cmManager ); 
 
     // CommsDat section starts
     CMDBSession* dbSession = CMDBSession::NewL(CMDBSession::LatestVersion());
diff -r 10810c91db26 -r 498f36116140 hotspotfw/hsserver/src/hotspotsession.cpp
--- a/hotspotfw/hsserver/src/hotspotsession.cpp	Fri Apr 16 16:07:56 2010 +0300
+++ b/hotspotfw/hsserver/src/hotspotsession.cpp	Mon May 03 13:32:51 2010 +0300
@@ -630,7 +630,11 @@
                 {
                 iServer.CompleteMessage( indx, KErrNone );    
                 }
-            TRAP_IGNORE( iIapSettingsHandler->CreateIapL() );
+            TRAPD( trap, iIapSettingsHandler->CreateIapL() );
+            if ( trap != KErrNone )
+                {
+                DEBUG1("CHotSpotSession::ConnectivityObserver trap: %d", trap);
+                }
             break;
         case EHttpAuthenticationNeeded :
             // Start browser for authentication
diff -r 10810c91db26 -r 498f36116140 hotspotfw/hsserver/src/hssiapsettingshandler.cpp
--- a/hotspotfw/hsserver/src/hssiapsettingshandler.cpp	Fri Apr 16 16:07:56 2010 +0300
+++ b/hotspotfw/hsserver/src/hssiapsettingshandler.cpp	Mon May 03 13:32:51 2010 +0300
@@ -148,39 +148,40 @@
         destination = cmManager.DestinationL( destinations[i] );
         CleanupClosePushL( destination ); 
         // Internet destination will always exist in the system.
-        // Internet destination will have ESnapPurposeInternet set in its metadata.
+        // Internet destination will have ESnapPurposeInternet 
+        // set in its metadata.
         if (destination.MetadataL( CMManager::ESnapMetadataPurpose ) == 
                                         CMManager::ESnapPurposeInternet )
             {
             CWlanMgmtClient* wlanMgmtClient = CWlanMgmtClient::NewL();
             CleanupStack::PushL( wlanMgmtClient );
             
-            TWlanConnectionMode connMode( EWlanConnectionModeNotConnected );
-            wlanMgmtClient->GetConnectionMode( connMode );
-
-            TWlanConnectionSecurityMode secMode( EWlanConnectionSecurityOpen );
-            wlanMgmtClient->GetConnectionSecurityMode( secMode );
-                        
+            TWlanConnectionMode connMode;
+            User::LeaveIfError( 
+                    wlanMgmtClient->GetConnectionMode( connMode ) );
+            
+            TWlanConnectionSecurityMode secMode;
+            User::LeaveIfError( 
+                    wlanMgmtClient->GetConnectionSecurityMode( secMode ) );
+                          
             HBufC* ssid( NULL );
             TWlanSsid ssidConn;
             
-            User::LeaveIfError( wlanMgmtClient->GetConnectionSsid( ssidConn ) );
+            User::LeaveIfError( 
+                    wlanMgmtClient->GetConnectionSsid( ssidConn ) );
             ssid = HBufC::NewLC( ssidConn.Length() );
             ssid->Des().Copy( ssidConn ); 
             
             TUint32 serviceId(0);
             TUint32 easyWlanIapId(0);
             easyWlanIapId = cmManager.EasyWlanIdL();
-            DEBUG1("CHssIapSettingsHandler::SaveDestinationL easyWlanIapId: %d", 
-                    easyWlanIapId);            
-            
+                       
             RCmConnectionMethodExt easyWlanPlugin;
             easyWlanPlugin = cmManager.ConnectionMethodL( easyWlanIapId );
             CleanupClosePushL( easyWlanPlugin );
             TBool scanSsid = easyWlanPlugin.GetBoolAttributeL( EWlanScanSSID );
-            DEBUG1("CHssIapSettingsHandler::SaveDestinationL scanSsid: %d", scanSsid);
-            TUint32 easyWlanServiceId = easyWlanPlugin.GetIntAttributeL( EWlanServiceId );
-            DEBUG1("CHssIapSettingsHandler::SaveDestinationL easyWlanServiceId: %d", easyWlanServiceId);
+            TUint32 easyWlanServiceId = 
+                    easyWlanPlugin.GetIntAttributeL( EWlanServiceId );
             CleanupStack::PopAndDestroy(); // easyWlanPlugin;
             
             RCmConnectionMethodExt plugin =
@@ -197,7 +198,7 @@
             destination.UpdateL();
             serviceId = plugin.GetIntAttributeL( EWlanServiceId );                
            
-            CleanupStack::PopAndDestroy( &plugin ); // Close() called
+            CleanupStack::PopAndDestroy( &plugin ); 
             if ( secMode == EWlanConnectionSecurityWep )
                 {
                 SaveWEPKeyL( easyWlanServiceId, serviceId );
@@ -207,12 +208,13 @@
                 {
                 SaveWPAKeyL( easyWlanServiceId, serviceId );
                 }
-            CleanupStack::PopAndDestroy( ssid ); // ssid
+            
+            CleanupStack::PopAndDestroy( ssid ); 
             CleanupStack::PopAndDestroy( wlanMgmtClient );
             }
-        CleanupStack::PopAndDestroy(); // destination
+        CleanupStack::PopAndDestroy( &destination ); 
         }
-    CleanupStack::PopAndDestroy(); // destinations
+    CleanupStack::PopAndDestroy( &destinations ); 
     CleanupStack::PopAndDestroy( &cmManager );
 
     DEBUG("CHssIapSettingsHandler::CreateIapL Done");
diff -r 10810c91db26 -r 498f36116140 wlanutilities/wlanindicatorplugin/inc/wlanindicatorplugin.h
--- a/wlanutilities/wlanindicatorplugin/inc/wlanindicatorplugin.h	Fri Apr 16 16:07:56 2010 +0300
+++ b/wlanutilities/wlanindicatorplugin/inc/wlanindicatorplugin.h	Mon May 03 13:32:51 2010 +0300
@@ -43,7 +43,7 @@
     //from HbIndicatorPluginInterface
     QStringList indicatorTypes() const;
     bool accessAllowed(const QString &indicatorType,
-                       const HbSecurityInfo *securityInfo) const;
+                       const QVariantMap &securityInfo ) const;
     HbIndicatorInterface* createIndicator(const QString &indicatorType);
     int error() const;
 public:
diff -r 10810c91db26 -r 498f36116140 wlanutilities/wlanindicatorplugin/src/wlanindicatorplugin.cpp
--- a/wlanutilities/wlanindicatorplugin/src/wlanindicatorplugin.cpp	Fri Apr 16 16:07:56 2010 +0300
+++ b/wlanutilities/wlanindicatorplugin/src/wlanindicatorplugin.cpp	Mon May 03 13:32:51 2010 +0300
@@ -42,7 +42,7 @@
     WlanIndicatorPlugin constructor.
 */
 WlanIndicatorPlugin::WlanIndicatorPlugin() :
-    HbIndicatorInterface(IndicatorType, GroupPriorityAverage, InteractionActivated),
+    HbIndicatorInterface(IndicatorType, SettingCategory, InteractionActivated),
     mError(0)
 {
     OstTraceFunctionEntry1(WLANINDICATORPLUGIN_WLANINDICATORPLUGIN_ENTRY, this);
@@ -74,7 +74,7 @@
     The handleClientRequest handles client request to change indicators parameters.
 */
 bool WlanIndicatorPlugin::accessAllowed(const QString &indicatorType,
-    const HbSecurityInfo *securityInfo) const
+    const QVariantMap &securityInfo) const
 {
     OstTraceFunctionEntry1(WLANINDICATORPLUGIN_ACCESSALLOWED_ENTRY, this);
 
@@ -207,12 +207,18 @@
             OstTrace0( WLANINDICATORPLUGIN_ERR,INVALID_PARAMS,"Invalid indicator parameters");
            }
         break;
-    case IconNameRole:
-        if (mParameter.isValid()) {
+        // this is the statusbar icon, which is shown only when a connection is active
+    case MonoDecorationNameRole:
         OstTraceFunctionExit1(DUP1_WLANINDICATORPLUGIN_INDICATORDATA_EXIT, this);
-        qvariant = HbIcon("qtg_small_wlan");
+        
+        if (mParameter.isValid() && mParameter.type() == QVariant::List) {
+            indicatorText = mParameter.toList();
+            if ((indicatorText.size() > 0) && (indicatorText[0] == wlanConnected)) {
+                qvariant = HbIcon("qtg_status_wlan");
+            }
+        }
         break;
-        }
+        // this is the icon in the indicator
     case DecorationNameRole:
         OstTraceFunctionExit1(DUP2_WLANINDICATORPLUGIN_INDICATORDATA_EXIT, this);
         qvariant = HbIcon("qtg_small_wlan");