--- a/hotspotfw/hsserver/src/hotspotserver.cpp	Thu Aug 19 10:59:40 2010 +0300
+++ b/hotspotfw/hsserver/src/hotspotserver.cpp	Tue Aug 31 16:18:40 2010 +0300
@@ -25,12 +25,12 @@
 #include <e32std.h>
 #include <commsdattypesv1_1.h>
 
-#include <cmconnectionmethodext.h>
+#include <cmconnectionmethod.h>
 #include <cmconnectionmethoddef.h>
 #include <cmpluginwlandef.h>
-#include <cmmanagerext.h>
+#include <cmmanager.h>
 #include <cmmanagerdef.h>
-#include <cmdestinationext.h>
+#include <cmdestination.h>
 
 #include "hotspotserver.h"
 #include "am_debug.h"
@@ -158,14 +158,15 @@
     iLoginValue = ETrue;
     iAssociationValue = EFalse;
     iClientIapsChecked = KErrNone;
-    iEasyWlanId = KEasyWlanServiceId; // Set to default value just in case
-
+    
     TRAP( iClientIapsChecked, FindClientIapsL() );
  
     // Activate notifications for IAP check purposes. Done with every server startup.
     // When EWlanConnectionModeNotConnected is received we can cancel this.
     iMgtClient = CWlanMgmtClient::NewL();
-    ActivateWlanNotificationsL();
+#ifndef __WINS__
+    iMgtClient->ActivateNotificationsL( *this );
+#endif 
     }
 
 // -----------------------------------------------------------------------------
@@ -202,7 +203,7 @@
 void CHotSpotServer::FindClientIapsL()
     {
     DEBUG("CHotSpotServer::FindClientIapsL()");
-    RCmManagerExt cmManager;
+    RCmManager cmManager;
     cmManager.OpenL();
     CleanupClosePushL(cmManager);
            
@@ -211,16 +212,12 @@
     TBool supportedBearersOnly = ETrue;
     TBool legacyCmsOnly = EFalse;
     
-    // Read Easy WLAN IAP ID first
-    iEasyWlanId = cmManager.EasyWlanIdL();
-    DEBUG1("CHotSpotServer::FindClientIapsL() iEasyWlanId: % d", iEasyWlanId);
-    
     cmManager.ConnectionMethodL( cmArray, supportedBearersOnly, legacyCmsOnly );
     DEBUG1("CHotSpotServer::FindClientIapsL count: %d", cmArray.Count());  
     
     for( TInt i = 0; i < cmArray.Count(); i++ )
         {
-        RCmConnectionMethodExt cm = cmManager.ConnectionMethodL( cmArray[i] );
+        RCmConnectionMethod cm = cmManager.ConnectionMethodL( cmArray[i] );
         CleanupClosePushL( cm );
         HBufC* daemonName = cm.GetStringAttributeL( 
                                                 ECmConfigDaemonManagerName );
@@ -276,14 +273,14 @@
         delete plugin;
 
         DEBUG1("CHotSpotServer::CheckIapsL find client error: %d", error );
-        if ( error != KErrNone )
+        if ( error == KErrNotFound )
             {
             // Remove from database
-            RCmManagerExt cmManager;
+            RCmManager cmManager;
             cmManager.OpenL();
             CleanupClosePushL(cmManager);
             
-            RCmConnectionMethodExt cm;
+            RCmConnectionMethod cm;
             cm = cmManager.ConnectionMethodL( iClientIaps[i].iIapId );
             CleanupClosePushL( cm );
             cmManager.RemoveAllReferencesL( cm );
@@ -302,19 +299,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// ActivateWlanNotificationsL
-// -----------------------------------------------------------------------------
-//
-void CHotSpotServer::ActivateWlanNotificationsL()
-    {
-    DEBUG("CHotSpotServer::ActivateWlanNotificationsL");
-#ifndef __WINS__
-    iMgtClient->CancelNotifications();
-    iMgtClient->ActivateNotificationsL( *this );
-#endif 
-    }
-
-// -----------------------------------------------------------------------------
 // NewSessionL
 // -----------------------------------------------------------------------------
 //
@@ -677,16 +661,6 @@
         }
     }
 
-// -----------------------------------------------------------------------------
-// GetEasyWlanId
-// -----------------------------------------------------------------------------
-//
-TInt CHotSpotServer::GetEasyWlanId()
-    {
-    DEBUG("CHotspotServer::GetEasyWlanId()");
-    return iEasyWlanId;
-    }
-
 // ========================== OTHER EXPORTED FUNCTIONS =========================
 
 // -----------------------------------------------------------------------------