# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1277310342 -10800
# Node ID d9ec2b8c6badd9505f18bf816f2d2a0e25df269c
# Parent  2dc6da6fb431fb9cacd9058116f8e013e1d99e54
Revision: 201023
Kit: 2010125

diff -r 2dc6da6fb431 -r d9ec2b8c6bad hotspotfw/hsclient/inc/hssiaphandler.h
--- a/hotspotfw/hsclient/inc/hssiaphandler.h	Fri Jun 11 14:43:07 2010 +0300
+++ b/hotspotfw/hsclient/inc/hssiaphandler.h	Wed Jun 23 19:25:42 2010 +0300
@@ -109,6 +109,12 @@
         void ConvertAsciiToHex( const TDes8& aSource, 
                                                 HBufC8*& aDest );   
                                                                          
+        /**
+        * Removes brackets from UID
+        * @param aUid, UID of the client
+        */
+        void ModifyClientUid( TDes& aUid );
+       
     private: // Data
         
         /**
diff -r 2dc6da6fb431 -r d9ec2b8c6bad hotspotfw/hsclient/src/hssiaphandler.cpp
--- a/hotspotfw/hsclient/src/hssiaphandler.cpp	Fri Jun 11 14:43:07 2010 +0300
+++ b/hotspotfw/hsclient/src/hssiaphandler.cpp	Wed Jun 23 19:25:42 2010 +0300
@@ -371,8 +371,11 @@
     {
     DEBUG("CHssIapSettingsHandler::GetClientsIapsL");
     TBuf<32> buffer;                    // Temporary buffer for found UID from destination.
-    TUidName uidClient = aUId.Name();   // UID of the client.
     TUint32 iapId = 0;                  // IAP Identifiier.
+    TBuf<KIapNameLength> uidClient;     // UID of the client.
+    
+    uidClient.Copy( aUId.Name() );
+    ModifyClientUid( uidClient );
 
     RArray<TUint32> destArray = RArray<TUint32>( 10 );  // KCmArrayGranularity instead of 10
     CleanupClosePushL( destArray );
@@ -424,4 +427,23 @@
     CleanupStack::PopAndDestroy( &destArray );
     }
 
+// -----------------------------------------------------------------------------
+// ModifyClientUid
+// -----------------------------------------------------------------------------
+//
+void CHssIapHandler::ModifyClientUid( TDes& aUid )
+    {
+    DEBUG("CHssIapHandler::ModifyClientUid");
+    TInt indx = aUid.Find( KMark1 );
+    if ( KErrNotFound != indx )
+        {
+        aUid.Delete( indx, 1 );
+        indx = aUid.Find( KMark2 );
+        if ( KErrNotFound != indx )
+            {
+            aUid.Delete( indx, 1 );
+            }
+        }
+    }
+
 // End of File