--- a/apengine/apeng/group/APEngine.MMP	Fri Apr 16 15:21:37 2010 +0300
+++ b/apengine/apeng/group/APEngine.MMP	Mon May 03 12:53:07 2010 +0300
@@ -63,10 +63,6 @@
 //Macro to /epoc32 headers
 MW_LAYER_SYSTEMINCLUDE
 
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-SYSTEMINCLUDE ../../../../../os/commsfw/commsconfig/commsdatabaseshim/commdbshim/ProtectedDB
-#endif
-
 LIBRARY     commdb.lib 
 LIBRARY     euser.lib
 LIBRARY     efsrv.lib

--- a/apengine/apeng/src/APNetworks.cpp	Fri Apr 16 15:21:37 2010 +0300
+++ b/apengine/apeng/src/APNetworks.cpp	Mon May 03 12:53:07 2010 +0300
@@ -25,11 +25,7 @@
 #include <ApNetworkItemList.h>
 #include <ApEngineConsts.h>
 
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <ProtectDB.h>
-#else
 #include <comms-infras/commdb/protection/protectdb.h>
-#endif
 
 #include "ApNetworks.h"
 #include "ApEngineLogger.h"

--- a/apengine/apeng/src/APSelect.cpp	Fri Apr 16 15:21:37 2010 +0300
+++ b/apengine/apeng/src/APSelect.cpp	Mon May 03 12:53:07 2010 +0300
@@ -22,12 +22,7 @@
 #include <eikdef.h>
 #include <d32dbms.h>
 #include <featmgr.h>
-
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <ProtectDB.h>
-#else
 #include <comms-infras/commdb/protection/protectdb.h>
-#endif
 
 #include <etelpckt.h>
 #ifdef __TEST_USE_SHARED_DATA

--- a/apengine/apeng/src/ApProtHandler.cpp	Fri Apr 16 15:21:37 2010 +0300
+++ b/apengine/apeng/src/ApProtHandler.cpp	Mon May 03 12:53:07 2010 +0300
@@ -21,13 +21,8 @@
 #include <commdb.h>
 #include <ApEngineConsts.h>
 
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <ProtectDB.h>
-#include <protectcpdb.h>
-#else
 #include <comms-infras/commdb/protection/protectdb.h>
 #include <comms-infras/commdb/protection/protectcpdb.h>
-#endif
 
 #include <ApProtHandler.h>
 #include <ApListItem.h>

--- a/apengine/apsettingsplugin/src/APSettingsPlugin.cpp	Fri Apr 16 15:21:37 2010 +0300
+++ b/apengine/apsettingsplugin/src/APSettingsPlugin.cpp	Mon May 03 12:53:07 2010 +0300
@@ -248,16 +248,17 @@
 // ---------------------------------------------------------
 void CApSettingsPlugin::DoSettingsL()
     {
-    CCmSettingsUi* settings = CCmSettingsUi::NewL();
-    CleanupStack::PushL( settings );
+    // RunSettingsL API removed from new cmmgr implementation
+    //CCmSettingsUi* settings = CCmSettingsUi::NewL();
+    //CleanupStack::PushL( settings );
     
-    if( settings->RunSettingsL() == CCmSettingsUi::EExit )
-        {
+    //if( settings->RunSettingsL() == CCmSettingsUi::EExit )
+    //    {
         //exit from General Settings
-        ProcessCommandL( EAknCmdExit );
-        }
+    //    ProcessCommandL( EAknCmdExit );
+    //    }
     
-    CleanupStack::PopAndDestroy( settings );
+    //CleanupStack::PopAndDestroy( settings );
     }
     
 

--- a/bearermanagement/mpm/group/mpmserver.mmp	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/group/mpmserver.mmp	Mon May 03 12:53:07 2010 +0300
@@ -34,7 +34,6 @@
 epocstacksize 0x5000
 
 SOURCEPATH        ../src
-SOURCE            mpmdialog.cpp
 SOURCE            mpmconnmonevents.cpp
 SOURCE            mpmconnmonreqs.cpp
 SOURCE            mpmserversession.cpp
@@ -55,6 +54,7 @@
 SOURCE            mpmcsidwatcher.cpp
 SOURCE            mpmdialogbase.cpp
 SOURCE            mpmdatausagewatcher.cpp
+SOURCE            mpmofflinewatcher.cpp
 
 USERINCLUDE       ../inc
 
@@ -81,8 +81,6 @@
 LIBRARY           connectionuiutilities.lib
 LIBRARY           cmmanagerdatabase.lib
 LIBRARY           charconv.lib
-LIBRARY           wifiprotclient.lib
-LIBRARY           wifiprotplugin.lib
 LIBRARY           cmmanager.lib
 DEBUGLIBRARY      flogger.lib
 

--- a/bearermanagement/mpm/inc/mpmcommsdataccess.h	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmcommsdataccess.h	Mon May 03 12:53:07 2010 +0300
@@ -54,36 +54,7 @@
 enum TWlanIapType
     {
     ENotWlanIap,
-    EWlanIap,
-    EEasyWlanIap
-    };
-
-// Structure containing WLAN WEP key data
-// 
-class TWepKeyData
-    {
-public:
-    inline TWepKeyData(): 
-    iWep1(),
-    iWep2(),
-    iWep3(),
-    iWep4(),
-    iWepFormat1( 0 ),
-    iWepFormat2( 0 ),
-    iWepFormat3( 0 ),
-    iWepFormat4( 0 ),
-    iDefaultWep( EWlanDefaultWepKey1 )
-    {};
-    
-    TWlanWepKey iWep1;
-    TWlanWepKey iWep2;
-    TWlanWepKey iWep3;
-    TWlanWepKey iWep4;
-    TUint iWepFormat1;
-    TUint iWepFormat2;
-    TUint iWepFormat3;
-    TUint iWepFormat4;
-    TWlanDefaultWepKey iDefaultWep;
+    EWlanIap
     };
 
 // CLASS DECLARATION
@@ -138,14 +109,6 @@
                            CMPMServerSession&       aSession );
     
         /**
-        * Checks if given IAP is Easy WLan.
-        * @since 3.1
-        * @param aIapId IAP Id to be checked
-        * @return ETrue if IAP Id is Easy WLan, otherwise EFalse.
-        */
-        TBool CheckEasyWLanL( TUint32 aIapId ) const;
-
-        /**
         * Find all snap ids
         *
         * @since 3.2
@@ -196,47 +159,6 @@
         void CheckWLANIapL(CMPMServerSession& aSession);
 
         /**
-        * Checks whether there is a wlan iap which matches the 
-        * parameter settings.
-        *
-        * @since 3.2
-        * @param aSsid Wlan iap ssid
-        * @param aSecMode Wlan iap security mode
-        * @param aConnMode Wlan iap connection mode
-        */
-        TUint32 CheckWLANIapWithSsidL( TWlanSsid& aSsid, 
-                                       TUint32 aSecMode,
-                                       TWlanNetMode aConnMode );
-
-        /**
-        * Stores easy wlan settings into commsdat. 
-        *
-        * @since 3.2
-        * @param aSsid Wlan iap ssid, stored in used ssid field
-        * @param aSecMode Wlan iap security mode
-        * @param aConnMode Wlan iap connection mode
-        * @param aWepData WEP key data
-        * @param aEnableWpaPsk Wlan iap enable psk mode
-        * @param aWpaPsk Wlan iap wpa psk
-        * @param aWpaKeyLen Wlan iap wpa key length
-        */
-        void SetEasyWlanDataL( const TWlanSsid& aSsid,
-                               TUint            aSecMode,
-                               TWlanNetMode     aConnMode,
-                               TWepKeyData      aWepData,
-                               TUint            aEnableWpaPsk,
-                               const TDesC8&    aWpaPsk,
-                               TUint            aWpaKeyLen  );
-
-        /**
-        * Returns Easy wlan service record id.
-        * @since 3.2
-        * @param aDb DB session
-        * return Easy wlan service record id
-        */
-        TUint32 FindEasyWlanServiceIdL( CMDBSession* aDb );
-        
-        /**
         * Checks if the HiddenAgent metadata is set for this IAP.
         * @since 3.2
         * @param aIapId Given Iap Id 
@@ -291,11 +213,10 @@
                                            RArray<TNetIap>& aEmbeddedIaps );
 
         /**
-        * Checks if given IAP is WLAN and whether it is EasyWLAN IAP.
+        * Checks if given IAP is WLAN.
         * @since 3.2
         * @param aIapId IAP Id to be checked
-        * @return One of TWlanIapType values depending on 
-        * whether IAP is WLAN or Easy WLAN
+        * @return One of TWlanIapType values
         */
         TWlanIapType CheckWlanL( TUint32 aIapId ) const;
 
@@ -351,36 +272,6 @@
         * @return Type of the bearer.
         */
         TMPMBearerType GetBearerTypeL( TUint32 aIapId );
-        
-       /**
-        * Check if all active connections are in same snap.
-        *
-        * @since 5.0
-        * @param aActiveBMConns Array of active connections.
-        * @param aSnapId Destination where connections are located is returned
-        *                to this parameter.
-        * @return ETrue if all active connections are in same snap.
-        */
-        TBool AreActiveIapsInSameSnapL ( RArray<TActiveBMConn>& aActiveBMConns,
-                                         TUint32& aSnapId );
-
-       /**
-        * Select active connection according to snap priorities.
-        *
-        * @since 5.0
-        * @param aSnapId Snap id of the connection.
-        * @param aActiveBMConns Array of active connections.
-        * @param aActiveIapId Iap id of the selected active connection.
-        * @param aActiveSnapId Snap id of the selected active connection.
-        * @param aActiveBearerType Bearer type of the selected active connection.
-        * @param aSession Handle to session class.
-        */
-        void SelectActiveConnectionL ( const TUint32 aSnapId,
-                                       RArray<TActiveBMConn>& aActiveBMConns,
-                                       TUint32& aActiveIapId,
-                                       TUint32& aActiveSnapId,
-                                       TMPMBearerType& aActiveBearerType,
-                                       CMPMServerSession& aSession );
 
        /**
         * Check if snap is empty.
@@ -521,30 +412,6 @@
         CCDRecordBase* LoadLinkedRecordL( CMDBSession&  aSession, 
                                           TMDBElementId aElementId );
 
-        /**
-         * Sets WEP key data for WLAN service record
-         * @since 9.1
-         * @param aFormatId Id of the field where WEP format is stored
-         * @param aKeyId Id of the field where WEP key is stored
-         * @param aWepData WEP key value
-         * @param aWepFormat WEP key format value
-         * @param aRecord WLAN service record where data is stored
-         */        
-       void SetWepKeyL( TMDBElementId       aFormatId,
-                        TMDBElementId       aKeyId, 
-                        TWlanWepKey         aWepData,
-                        TUint               aWepFormat,
-                        CMDBGenericRecord*  aRecord );
-        
-       /**
-        * Converts ascii data to hex
-        * @since 3.2
-        * @param aSource Ascii data
-        * @param aDest hex data to be filled in
-        */        
-        void ConvertAsciiToHex( const TDesC8& aSource, 
-				                HBufC8*      aDest );
-
        /**
         * Returns true if destination is internet.
         * @since 5.1
@@ -572,15 +439,6 @@
         * @param aWlanArray Array of wlan bearers
         */
         void BuildWlanArrayL(CMDBSession& aDb, RArray<TUint32>& aWlanArray);
-        
-       /**
-        * Get snap id for the iap
-        * 
-        * @since 5.0
-        * @param aIapId Id of the iap
-        * @return Id of the snap
-        */
-        TUint32 GetSnapIdL( TUint32 aIapId );
 
         /**
         * C++ default constructor.

--- a/bearermanagement/mpm/inc/mpmcsidwatcher.h	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmcsidwatcher.h	Mon May 03 12:53:07 2010 +0300
@@ -23,6 +23,9 @@
 
 class CRepository;
 
+// Stop after this many consecutive central repository errors.
+const TInt KMpmCsIdWatcherCenRepErrorThreshold = 80;
+
 /**
  *  Class for accessing central repository
  *  Follows KMpmConnectScreenId key in central repository.
@@ -57,8 +60,6 @@
 
     void RunL();
 
-    TInt RunError( TInt aError );
-
     void DoCancel();
 
 private:
@@ -66,6 +67,16 @@
     CMpmCsIdWatcher();
 
     void ConstructL();
+    
+    /**
+     * Request for notifications.
+     */
+    TInt RequestNotifications();
+        
+    /**
+     * Get Connect screen ID from repository.
+     */
+    TInt GetConnectScreenId();
 
 private: // data
 
@@ -84,6 +95,11 @@
      * Set when user connection is enabled
      */
     TBool iUserConnectionSupported;
+
+    /**
+     * Error counter.
+     */
+    TUint iErrorCounter;
     };
 
 #endif // MPMCSIDWATCHER_H

--- a/bearermanagement/mpm/inc/mpmdatausagewatcher.h	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmdatausagewatcher.h	Mon May 03 12:53:07 2010 +0300
@@ -24,6 +24,9 @@
 class CRepository;
 class CMPMServer;
 
+// Stop after this many consecutive central repository errors.
+const TInt KMpmDataUsageWatcherCenRepErrorThreshold = 80;
+
 /**
  *  Class for accessing central repository.
  *  Follows KCurrentCellularDataUsage key in central repository.
@@ -55,11 +58,6 @@
     void RunL();
 
     /**
-    * Active object's RunError.
-    */
-    TInt RunError( TInt aError );
-
-    /**
     * Active object's DoCancel.
     */
     void DoCancel();
@@ -75,6 +73,17 @@
     * Symbian 2nd phase constructor.
     */
     void ConstructL();
+    
+    /**
+    * Request for notifications.
+    */
+    TInt RequestNotifications();
+    
+    /**
+    * Get current cellular data usage value.
+    */
+    TInt GetCurrentDataUsageValue();
+
 
 private: // data
 
@@ -95,6 +104,11 @@
      */
     CMPMServer* iServer;
 
+    /**
+     * Error counter.
+     */
+    TUint iErrorCounter;
+
     };
 
 #endif // MPMDATAUSAGEWATCHER_H

--- a/bearermanagement/mpm/inc/mpmdialog.h	Fri Apr 16 15:21:37 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
-* Copyright (c) 2004-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: MPM class used for agent dialog initiation
-*
-*/
-
-/**
-@file mpmdialog.h
-Mobility Policy Manager agent dialog initiation class.
-*/
-
-#ifndef MPMDIALOG_H
-#define MPMDIALOG_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <agentdialog.h>
-
-#include "mpmiapselection.h"
-#include "mpmdialogbase.h" 
-
-// CLASS DECLARATION
-/**
-*  MPM dialog initiation class definition.
-*
-*  @lib MPMServer.exe
-*  @since 3.0
-*/
-class CMPMDialog : protected CMPMDialogBase
-    {    
-public:
-
-    /**
-     * Two-phased constructor.
-     * @param aCommDbConnPref Connection preferences
-     */
-    static CMPMDialog* NewL( CMPMIapSelection&          aIapSelection,
-                             const RAvailableIAPList&   aIAPList,
-                             TUint32                    aBearerSet,
-                             CArrayPtrFlat<CMPMDialog>& aQueue,
-                             CMPMServer&                aServer );
-
-    /**
-     * Destructor.
-     */
-    virtual ~CMPMDialog();
-
-    /**
-     * Write sort snap information to publish and subscribe.
-     * 
-     * Publish and subscribe is used as there is otherwise circular 
-     * reference between MPM and connection dialogs which causes 
-     * @since 3.2 
-     */
-    void PublishSortSnapInfoL();
-
-protected: // Functions from base classes
-    /**
-     * Called from the Base class implementation 
-     * when dialog is started. In the current
-     * call stack it's possible to query aDlg for 
-     * more information and after that pointer is 
-     * invalid.
-     */
-    virtual void Start( CMPMDialogBase* aDlg = NULL );
-
-    
-    /**
-     * From CActive. Cancels UI dialog.
-     * @since 3.0
-     */        
-    void DoCancel();
-
-    /**
-     * From CActive. Run when UI dialog finished.
-     * @since 3.0
-     */               
-    void RunL();
-
-    /**
-     * From CActive. Run if RunL leaves.
-     * @since 3.0
-     * @param aError Error that caused leave.
-     * @return KErrNone
-     */
-    TInt RunError( TInt aError );
-
-private: // New methods
-    /**
-     * Initiates a UI dialog towards Agent Dialog Server.
-     * @since 3.0
-     */
-    void InitSelectConnection();
-
-    /**
-     * C++ default constructor.
-     * @param aCommDbConnPref Connection preferences
-     */
-    CMPMDialog( CMPMIapSelection&           aIapSelection,
-                TUint32                     aBearerSet,
-                CArrayPtrFlat<CMPMDialog>&  aQueue,
-                CMPMServer&                 aServer );
-
-    /**
-     * 2nd phase constructor.
-     */
-    void ConstructL( const RAvailableIAPList& aIAPList );
-
-    /**
-     * Copies aOrigin to aCopy. 
-     * @since 3.2 
-     * @param aOrigin Original RAvailableIAPList.
-     * @param aCopy Copy RAvailableIAPList.
-     * @return KErrNone if successful, otherwise one of the 
-     * system-wide error codes.
-     */
-    TInt CopyArray( const RAvailableIAPList& aOrigin, 
-                    RAvailableIAPList&       aCopy );
-
-    /**
-     * Clean sort snap information from publish and subscribe.
-     * 
-     * @since 3.2 
-     */
-    void CleanSortSnapInfo();
-
-private: // Data
-    // Agent Dialog server
-    RGenConAgentDialogServer    iDlgServ;
-
-    // Iap selection object reference
-    CMPMIapSelection&           iIapSelection;
-
-    // SNAP or IAP id
-    TUint32                     iSnapOrIAPId;
-
-    // Bearer set as a combination of
-    // TExtendedConnPref::TExtendedConnBearer values.
-    TUint32                     iBearerSet;
-
-    // Handle to server class
-    CMPMServer&                 iServer;
-
-    RAvailableIAPList           iIAPList;
-    };
-
-
-#endif // MPMDIALOG_H
-
-// End of file

--- a/bearermanagement/mpm/inc/mpmiapselection.h	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmiapselection.h	Mon May 03 12:53:07 2010 +0300
@@ -23,18 +23,10 @@
 #include "mpmserversession.h"
 #include "mpmcommsdataccess.h"
 
-class CMPMDialog;
 class CMPMWlanQueryDialog;
 class CMPMConfirmDlgStarting;
 class TMpmConnPref;
 
-enum TOfflineNoteResponse
-    {
-    EOfflineResponseUndefined,
-    EOfflineResponseYes,
-    EOfflineResponseNo
-    };
-
 /**
  * Handles IAP selection. MPM Server session
  * uses the class to select the best available 
@@ -73,7 +65,8 @@
      * Two-phased constructor.
      */
     static CMPMIapSelection* NewL( CMPMCommsDatAccess*  aCommsDatAccess,
-                                   CMPMServerSession*   aSession );
+                                   CMPMServerSession*   aSession,
+                                   CConnectionUiUtilities* aConnUiUtils );
     
     /**
      * Destructor.
@@ -96,14 +89,6 @@
      */
     void ExplicitConnectionL();
 
-    /**
-     * Updates connection dialog contents if 
-     * the dilog is shown
-     *
-     * @since S60 v3.2
-     */
-    void UpdateConnectionDialogL();
-
 public:
     /**
      * Starts Wlan query if Iap is wlan iap.
@@ -218,27 +203,6 @@
     void HandleUserSelectionL( TBool aIsIap, TUint32 aId, TInt aError  );
 
     /**
-     * Returns the stored user response to the offline note
-     * @since 3.2
-     */
-    TOfflineNoteResponse OfflineNoteResponse();
-
-    /**
-     * Stores the user response to the offline note
-     * @since 3.2
-     * @param aResponse Offline note response
-     */
-    void SetOfflineNoteResponse( TOfflineNoteResponse aResponse );
-
-    /**
-     * Iap selection is notified that conenction is started. 
-     * Offline note response is reseted.
-     *
-     * @since 3.2
-     */
-    void ConnectionStarted();
-
-    /**
      * Get original MPM connection preferences
      * @since 5.2
      */
@@ -303,7 +267,8 @@
      * C++ default constructor.
      */
     CMPMIapSelection( CMPMCommsDatAccess*   aCommsDatAccess,
-                      CMPMServerSession*    aSession );
+                      CMPMServerSession*    aSession,
+                      CConnectionUiUtilities* aConnUiUtils );
 
     /**
      * ConstructL
@@ -324,6 +289,9 @@
     // Used for commsdat related functionalities
     CMPMCommsDatAccess* iCommsDatAccess;
 
+    // Handle to connection UI utilities
+    CConnectionUiUtilities* iConnUiUtils;
+
     // Contains state info whether PrefIapnotifs can be sent 
     // and saved IAP info structure.
     TStoredIapInfo iStoredIapInfo;
@@ -337,9 +305,6 @@
     // Pointer to Confirmation dialog.
     CMPMConfirmDlgStarting* iConfirmDlgStarting;
 
-    // Pointer to the dialog active object.
-    CMPMDialog* iDialog;
-
     // Pointer to Wlan query dialog.
     CMPMWlanQueryDialog* iWlanDialog;
 
@@ -356,11 +321,6 @@
     // State of impilict connection start
     TImplicitConnectionState iImplicitState;
 
-    // Offline note response for the connection. 
-    // Offline note must be displayed only once 
-    // during the connection (not for each wlan iap of a snap).
-    TOfflineNoteResponse iOfflineNoteResponse;
-
     // True if connection is roaming (set when displaying offline note)
     TBool iIsRoaming;
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bearermanagement/mpm/inc/mpmofflinewatcher.h	Mon May 03 12:53:07 2010 +0300
@@ -0,0 +1,119 @@
+/*
+* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Listens for offline mode changes in central repository.
+*
+*/
+
+#ifndef MPMOFFLINEWATCHER_H
+#define MPMOFFLINEWATCHER_H
+
+//  INCLUDES
+#include <e32base.h>
+
+class CRepository;
+class CMPMServer;
+
+// Stop after this many consecutive central repository errors.
+const TInt KMpmOfflineWatcherCenRepErrorThreshold = 80;
+
+/**
+ *  Class for accessing central repository.
+ *  Follows KCoreAppUIsNetworkConnectionAllowed key in central repository.
+ *  @since 5.2
+ */
+class CMpmOfflineWatcher : public CActive
+    {
+
+public:
+
+    /**
+    * New for calling the two-phased constructor.
+    */
+    static CMpmOfflineWatcher* NewL( CMPMServer* aServer );
+
+    /**
+    * Destructor.
+    */
+    virtual ~CMpmOfflineWatcher();
+
+    /**
+     * Start to listen for events.
+     */
+    void StartL();
+    
+    /**
+    * Active object's RunL.
+    */
+    void RunL();
+
+    /**
+    * Active object's DoCancel.
+    */
+    void DoCancel();
+
+private:
+
+    /**
+    * C++ default constructor.
+    */
+    CMpmOfflineWatcher( CMPMServer* aServer );
+
+    /**
+    * Symbian 2nd phase constructor.
+    */
+    void ConstructL();
+    
+    /**
+    * Request for notifications.
+    */
+    TInt RequestNotifications();
+    
+    /**
+    * Get current offline mode value.
+    */
+    TInt GetCurrentOfflineValue();
+
+
+private: // data
+
+    /**
+     * Is offline feature supported.
+     */
+    TBool iOfflineFeatureSupported;
+
+    /**
+     * Central repository handle.
+     * Own.
+     */
+    CRepository* iRepository;
+
+    /**
+     * Offline mode activity value.
+     */
+    TInt iOfflineMode;     // type: TCoreAppUIsNetworkConnectionAllowed
+
+    /**
+     * Pointer to the MPM Server object.
+     * Not own.
+     */
+    CMPMServer* iServer;
+
+    /**
+     * Error counter.
+     */
+    TUint iErrorCounter;
+
+    };
+
+#endif // MPMOFFLINEWATCHER_H

--- a/bearermanagement/mpm/inc/mpmserver.h	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmserver.h	Mon May 03 12:53:07 2010 +0300
@@ -29,6 +29,7 @@
 #include <etel.h>           // RTelServer
 #include <etelmm.h>         // RMobilePhone
 #include <etelpckt.h>       // RPacketService
+#include <ConnectionUiUtilities.h>
 
 #include "mpmcommon.h"
 #include "rmpm.h"
@@ -38,6 +39,7 @@
 class CMPMCommsDatAccess;
 class CMpmCsIdWatcher;
 class CMpmDataUsageWatcher;
+class CMpmOfflineWatcher;
 
 // CONSTANTS
 _LIT( KMPMPanicCategory, "Mobility Policy Manager Server" );
@@ -167,6 +169,13 @@
     EMPMBearerTypeOther
     };
 
+enum TOfflineWlanQueryResponse
+    {
+    EOfflineResponseUndefined,
+    EOfflineResponseYes,
+    EOfflineResponseNo
+    };
+
 // FUNCTION PROTOTYPES
 void PanicServer( TInt aPanic );
 
@@ -179,7 +188,6 @@
 class CMPMConfirmDlgStarting;
 class CMPMDefaultConnection;
 class CMPMWlanQueryDialog;
-class CMPMDialog;
 
 // CLASS DECLARATION
 /**
@@ -343,8 +351,10 @@
         * Checks if the connection is started for the Iap Id.
         * @since 3.2
         * @param aIapId IAP Id of the connection
+        * @param aConnId Connection Id
         */
-        TBool CheckIfStarted( const TUint32 aIapId );
+        TBool CheckIfStarted( const TUint32 aIapId, 
+                              const TConnectionId aConnId );
 
         /**
         * Checks if a connection is started with wlan iap.
@@ -445,12 +455,6 @@
                                const TPrefIAPNotifCaller aCaller );
 
         /**
-        * Update Connection dialog of each session
-        * @since 3.2
-        */
-        void UpdateSessionConnectionDlgL();
-
-        /**
         * Handling of blacklisting certain IAP and the presumed IAP for 
         * the certain connection.
         * @since 3.1
@@ -629,13 +633,6 @@
         inline CMPMWlanQueryDialog* FirstInWlanQueryQueue();
 
         /**
-        * Get the ConnectDialogQueue.
-        * @since 3.2
-        * @return Pointer to the CMPMDialogQueue.
-        */
-        inline CArrayPtrFlat<CMPMDialog>* ConnectDialogQueue();
-
-        /**
         * Get the Default Connection object.
         * @since 3.2
         * @return Pointer to the Default Connection object.
@@ -790,34 +787,6 @@
         inline CMpmCsIdWatcher* CsIdWatcher();
 
         /**
-        * Change state of the P&S keys according to active connection.
-        * @since 5.0
-        * @param aSession Handle to session used by connection.
-        */
-        void UpdateActiveConnectionL( CMPMServerSession& aSession );
-
-        /**
-        * Map bearer type between MPM and commsdat.
-        * @since 5.0
-        * @param aBearerType Bearer type used by MPM for active connection selection.
-        * @return Bearer type used by commsdat
-        */
-        TUint32 MapBearerType( TMPMBearerType aBearerType );
-
-        /**
-        * Writes new active connection to the P&S keys
-        * @since 5.0
-        */    
-        void PublishActiveConnection();
-        
-        /**
-        * Returns number of active connections.
-        * @since 5.0
-        * @return Number of active connections
-        */
-        TInt NumberOfActiveConnections();
-
-        /**
         * Returns server session instance that corresponds to given
         * connection id.
         * @since 5.2
@@ -832,6 +801,39 @@
         * @since 5.2
         */
         void StopCellularConns();
+        
+        /**
+        * Handle to connection ui utilities
+        */        
+        inline CConnectionUiUtilities* ConnUiUtils() const;
+
+        /**
+        * Offline mode watcher updates the mode variable stored by MPM server.
+        * @since 5.2
+        * @param aNewModeValue New offline mode value to be updated.
+        */
+        void UpdateOfflineMode( TInt aNewModeValue );
+
+        /**
+        * Tells if the phone is in offline mode.
+        * @since 5.2
+        * @return ETrue if phone is in offline mode.
+        */
+        TBool IsPhoneOffline();
+
+        /**
+        * Tells the "Use WLAN in offline mode" query response.
+        * @since 5.2
+        * @return TOfflineWlanQueryResponse (not_responded/yes/no).
+        */
+        TOfflineWlanQueryResponse OfflineWlanQueryResponse();
+
+        /**
+        * Called when the "Use WLAN in offline mode" query has been responded.
+        * @since 5.2
+        * @param aResponse setting the query response value (not_responded/yes/no).
+        */
+        void SetOfflineWlanQueryResponse( TOfflineWlanQueryResponse aResponse);
 
     private:
 
@@ -912,9 +914,6 @@
 
         // Solves problem with overlapping Wlan Queries
         CArrayPtrFlat<CMPMWlanQueryDialog>* iWlanQueryQueue;
-
-        // Solves problem with overlapping Connection Dialogs
-        CArrayPtrFlat<CMPMDialog>* iConnectDialogQueue;
         
         // Handles Default Connection selection
         CMPMDefaultConnection* iDefaultConnection;
@@ -938,24 +937,30 @@
         CMpmCsIdWatcher* iMpmCsIdWatcher;
 
         /**
-         * Handle to another central repository watcher
+         * Handle to central repository watcher
          */
         CMpmDataUsageWatcher* iMpmDataUsageWatcher;
 
-        // Iap id of the active connection
-        TUint32 iActiveIapId;
-        
-        // Snap id of the active connection
-        TUint32 iActiveSnapId;
-
-        // Bearer type of the active connection
-        TMPMBearerType iActiveBearerType;
+        /**
+         * Handle to central repository watcher
+         */
+        CMpmOfflineWatcher* iMpmOfflineWatcher;
 
         // Dedicated clients
         RArray<TUint32> iDedicatedClients;
 
         // Used for commsdat related functionalities
         CMPMCommsDatAccess* iCommsDatAccess;
+
+        // Handle to connection UI utilities
+        //
+        CConnectionUiUtilities* iConnUiUtils;
+        
+        // Offline mode.
+        TInt iOfflineMode;
+        
+        // Is WLAN usage already accepted in this offline session.
+        TOfflineWlanQueryResponse iOfflineWlanQueryResponse;
     };
 
 #include "mpmserver.inl"

--- a/bearermanagement/mpm/inc/mpmserver.inl	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmserver.inl	Mon May 03 12:53:07 2010 +0300
@@ -136,15 +136,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CMPMServer::ConnectDialogQueue
-// -----------------------------------------------------------------------------
-//
-inline CArrayPtrFlat<CMPMDialog>* CMPMServer::ConnectDialogQueue()
-    {
-    return iConnectDialogQueue;
-    }
-
-// -----------------------------------------------------------------------------
 // CMPMServer::IncrementConnections
 // -----------------------------------------------------------------------------
 //
@@ -262,9 +253,18 @@
 // CMPMServer::RoamingWatcher()
 // -----------------------------------------------------------------------------
 //
-CMPMRoamingWatcher* CMPMServer::RoamingWatcher() const
+inline CMPMRoamingWatcher* CMPMServer::RoamingWatcher() const
     {
     return iRoamingWatcher;
     }
 
+// -----------------------------------------------------------------------------
+// CMPMServer::ConnUiUtils()
+// -----------------------------------------------------------------------------
+//
+inline CConnectionUiUtilities* CMPMServer::ConnUiUtils() const
+    {
+    return iConnUiUtils;
+    }
+
 // End of File

--- a/bearermanagement/mpm/inc/mpmserversession.h	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmserversession.h	Mon May 03 12:53:07 2010 +0300
@@ -28,7 +28,7 @@
 #include <commdbconnpref.h> // for TCommDbConnPref
 #include <connpref.h>       // for TConnPref
 #include <rconnmon.h>       // for TConnMonIapInfo
-#include <ConnectionUiUtilities.h> //TMsgQueryLinkedResults
+#include <ConnectionUiUtilities.h>
 #include "rmpm.h"
 #include "mpmserver.h"
 
@@ -289,13 +289,6 @@
         void ClientErrorNotificationL( TInt aError );
 
         /**
-        * Checks if phone is in offline mode or not.
-        * @since 3.1
-        * @return ETrue if phone is in offline mode, otherwise EFalse.
-        */
-        TBool IsPhoneOfflineL() const;
-
-        /**
         * Returns the list of available IAPs, where the blacklisted IAPs 
         * have already been removed.
         * @since 3.2
@@ -328,13 +321,6 @@
         void SortSnapL( const TUint32   aSnapId, 
                         TMpmSnapBuffer& aSortedIaps );
 
-        /**
-        * If session is displaying connection selection dialog
-        * updated contents for it are written to publish& subscribe API.
-        *
-        * @since 3.2
-        */
-        void UpdateConnectionDialogL();
 
         /**
         * Returns a reference to iStoredIapInfo. 
@@ -807,9 +793,9 @@
         * @param aValidatedIap Iap validated by MPM for roaming
         * @return ETrue if necessary, otherwise EFalse.
         */
-        TBool CheckNotifNeed( const TUint32       aCurrentIap,
-                              const TUint32       aLastNotifiedIap,
-                              const TUint32       aValidatedIap );
+        TBool CheckNotifNeedL( const TUint32       aCurrentIap,
+                               const TUint32       aLastNotifiedIap,
+                               const TUint32       aValidatedIap );
 
         /**
         * Returns the list of unavailable IAPs.
@@ -944,21 +930,26 @@
         //    
         CMPMIapSelection* iIapSelection;
 
-		// Stored state of migrating to carrier
-		// 
-		TMigrateToCarrierState iMigrateState;
+				// Stored state of migrating to carrier
+				// 
+				TMigrateToCarrierState iMigrateState;
 
-		// Last Iap notified using PreferredIap-notification
-		//
-		TUint32 iLastNotifiedIap;
+				// Last Iap notified using PreferredIap-notification
+				//
+				TUint32 iLastNotifiedIap;
 		
-		// Iap to which connection is migrating
+		    // Iap to which connection is migrating
         //
         TUint32 iMigrateIap;
 
         // Set when this session is user connection
-		//
+		    //
         TBool iUserConnection;
+        
+        // Set when disconnect dialog is shown to avoid 
+        // showing duplicate cellulara data usage dialog
+        //
+        TBool iDisconnectDialogShown;
     };
 
 #include "mpmserversession.inl"

--- a/bearermanagement/mpm/inc/mpmwlanquerydialog.h	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmwlanquerydialog.h	Mon May 03 12:53:07 2010 +0300
@@ -22,16 +22,8 @@
 #include <e32std.h>
 #include <wdbifwlansettings.h> //for struct
 #include <ConnectionUiUtilities.h>
-#include <wifiprotuiclient.h>
-#include <wifiprotreturn.h>
 
-#include "mpmiapselection.h" // for TOfflineNoteResponse
-
-// ID of Easy Wep dialog
-const TUid KUidEasyWepDlg = { 0x101FD673 };
-
-// ID of Easy Wpa dialog
-const TUid KUidEasyWpaDlg = { 0x101FD674 };
+#include "mpmcommsdataccess.h"
 
 // ID of OfflineWlanNote dialog
 const TUid KUidCOfflineWlanNoteDlg = { 0x101FD671 };
@@ -51,16 +43,8 @@
                                         ///< Wlan network supports Protected Setup
     };
 
-const TInt KEasyWepQuery256BitMaxLength = 58;
+class CMPMIapSelection;
 
-class TWlanAgtWepKeyData
-    {
-public:
-    TBuf< KEasyWepQuery256BitMaxLength > iKey;
-    TBool iHex;
-    };
-
-class CMPMIapSelection;
 /**
  *  Handles displaying wlan related dialogs
  *
@@ -72,12 +56,7 @@
 
 enum TWlanQueryState
     {
-    EOffline,
-    EWlanNetwork,
-    EWepSettings,
-    EWpaSettings, 
-    EWPS,
-    ERetrySettingsStorage
+    EOffline
     };
 
 public:
@@ -119,14 +98,6 @@
         * @since 3.2
         */
         void StartWlanQueryL();
-        
-        /**
-        * Stores user defined easy wlan parameters to commsdat
-        * if easy wlan has been selected.
-        *
-        * @since 3.2
-        */
-        void StoreEasyWlanSelectionL();
 
 private:
 
@@ -134,105 +105,16 @@
          * Propagates wlan network selection as an initial value for the dialog,
          * Used if there are several dialogs queued.
          *
-         * @param aWlanIapId     Selected WLAN IAP
-         * @param aOfflineStatus Offline note response
          * @param aDialogStatus  Status of the dialog when destroyed.
          * @since 3.2
          */
-        void OfferInformation( TUint32 aWlanIapId, 
-                               TOfflineNoteResponse aOfflineStatus,
-                               TInt aDialogStatus );
+        void OfferInformation( TInt aDialogStatus );
 
-        CMPMWlanQueryDialog( CMPMIapSelection&  aSession,
+        CMPMWlanQueryDialog( CMPMIapSelection&  aIapSelection,
                              TUint32            aSelectedWlanIap );
 
         void ConstructL();
 
-        /**
-        * Gets Easy Wlan data from member variables and stores 
-        * it to arguments
-        *
-        * @since 9.1
-        * @param aSsid Wlan iap ssid, stored in used ssid field
-        * @param aSecMode Wlan iap security mode
-        * @param aConnMode Wlan iap connection mode
-        * @param aWepKeyData Wlan iap wep key data
-        * @param aEnableWpaPsk Wlan iap enable psk mode
-        * @param aWpaPsk Wlan iap wpa psk
-        * @param aWpaKeyLen Wlan iap wpa key length
-        */
-        void GetEasyWlanDataL( TWlanSsid&    aSsid,
-                               TUint&        aSecMode,
-                               TWlanNetMode& aConnMode,
-                               TWepKeyData&  aWepKeyData, 
-                               TUint&        aEnableWpaPsk,
-                               TDes8&        aWpaPsk,
-                               TUint&        aWpaKeyLen  );
-
-        /**
-        * Maps TWlanConnectionSecurityMode to security mode stored in CommsDat
-        *
-        * @since 9.1
-        * @param aConnSecmode Security mode in TWlanConnectionSecurityMode format
-        * @param aCommsdatSecMode returned security mode value in CommsDat format
-        */
-        TInt ConnSecModeToCommsDatSecMode( TWlanConnectionSecurityMode aConnSecmode,
-                                           TUint& aCommsdatSecMode ) const;
-
-        /**
-        * Maps TWlanIapSecurityMode to security mode stored in CommsDat
-        *
-        * @since 9.1
-        * @param aConnSecmode Security mode in TWlanIapSecurityMode format
-        * @param aCommsdatSecMode returned security mode value in CommsDat format
-        */
-        TInt IapSecModeToCommsDatSecMode( TWlanIapSecurityMode aConnSecmode,
-                                          TUint& aCommsdatSecMode ) const;
-
-        /**
-        * Gets Easy Wlan data from member variables when WPS has been used 
-        * and stores it to arguments
-        *
-        * @since 9.1
-        * @param aSsid Wlan iap ssid, stored in used ssid field
-        * @param aSecMode Wlan iap security mode
-        * @param aConnMode Wlan iap connection mode
-        * @param aWepKeyData WEP key data
-        * @param aEnableWpaPsk Wlan iap enable psk mode
-        * @param aWpaPsk Wlan iap wpa psk
-        * @param aWpaKeyLen Wlan iap wpa key length
-        */
-        void GetEasyWlanDataForWpsL( TWlanSsid&    aSsid,
-                                     TUint&        aSecMode,
-                                     TWlanNetMode& aConnMode,
-                                     TWepKeyData&  aWepKeyData, 
-                                     TUint&        aEnableWpaPsk,
-                                     TDes8&        aWpaPsk,
-                                     TUint&        aWpaKeyLen  );
-
-        /**
-        * Starts WPS dialog and sets the active object active.
-        *
-        * @since 9.1
-        */
-        void StartWpsDlgL();
-
-        /**
-        * Determines whether WEP key is hex format based on the length
-        *
-        * @since 9.1
-        * @param aLength 
-        * @return ETrue if format is hex, otherwise EFalse
-        */
-        TBool IsWepFormatHexL( TInt aLength ) const;
-
-        /**
-        * Get the network preferences using ConnectionUiUtilities API.
-        *
-        * @since 5.1
-        */
-        void GetNetworkPrefs();
-
 private: // data
 
         // Reference to iap selection object
@@ -244,47 +126,20 @@
         // Stores data for wlan network guery
         TPckgBuf<TMpmWlanNetworkPrefs> iNetworkPrefs;
         
-        // Stores data for wep query
-        TPckgBuf<TWlanAgtWepKeyData> iNotifWep;
-        
-        // Stores data for wpa query
-        TPckgBuf< TBuf< KWLMMaxWpaPskLength > > iNotifWpaKey;
-
         //Interfce to Notifier
         RNotifier iNotifier;
 
         //State of querying Wlan settings
         TWlanQueryState iWlanQueryState;
             
-        // selected wlan iap id
-        TUint32 iWlanIapId;
-            
-        // ETrue if user has selected easy wlan
-        TBool iEasyWlanSelected;
-            
-        // Flag that can be used to cancel the dialog startup based on earlier dialog
-        TInt iOverrideStatus;
-            
         // Connection Ui Utilities pointer
         CConnectionUiUtilities* iConnUiUtils;
-
-        // Contains WLAN settings received through WPS
-        TWlanProtectedSetupCredentialAttribute iWpsAttribute;
-
-        // WPS client pointer for displaying WPS dialogs
-        CWiFiProtUiClient* iWps;
-
-        // Contains WPS return value
-        WiFiProt::TWiFiReturn iWpsReturn;
-
-        // True if wps has been completed. 
-        TBool iWpsCompleted;
         
-        // Retry count
-        TUint32 iRetryCount;
+        // Wlan iap
+        TUint32 iWlanIapId;
         
-        // Retry timer
-        RTimer iTimer;
+        // Flag that can be used to cancel the dialog startup based on earlier dialog
+        TInt iOverrideStatus;
     };
 
 #endif // MPMWLANQUERYDIALOG_H

--- a/bearermanagement/mpm/inc/rmpm.h	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/inc/rmpm.h	Mon May 03 12:53:07 2010 +0300
@@ -63,71 +63,6 @@
 // Write policy
 _LIT_SECURITY_POLICY_C1( KMPMSortSnapWritePolicy, ECapabilityNetworkControl );
 
-// Definitions for Reading/Writing user connection data
-// to publish and subscribe API
-//
-// UID of the category (note that uid is the same as sort snap category)
-const TUid KMPMUserConnectionCategory = { 0x101f6d3a };
-
-// Keys for this category
-const TUint KMPMPSKeyUserConnectionSnap = 10001;
-const TUint KMPMPSKeyUserConnectionIap = 10002;
-
-// Property types
-const TInt KMPMUserConnectionSnapType = RProperty::EInt;
-const TInt KMPMUserConnectionIapType = RProperty::EInt;
-
-// Read policy, no capabilities required
-// This format is used instead of _LIT_SECURITY_POLICY_PASS, which 
-// produces pclint warnings
-_LIT_SECURITY_POLICY_C1( KMPMUserConnectionReadPolicy, ECapability_None );
-
-// Write policy
-_LIT_SECURITY_POLICY_C1( KMPMUserConnectionWritePolicy, ECapabilityNetworkControl );
-
-// Definitions for Reading/Writing active connection data 
-// to publish and subscribe API
-//
-// UID of the category
-const TUid KMPMActiveConnectionCategory = { 0x101f6d3a };
-
-// Property types
-const TInt KMPMActiveConnectionIapType = RProperty::EInt;
-const TInt KMPMActiveConnectionSnapType = RProperty::EInt;
-const TInt KMPMActiveConnectionBearerType = RProperty::EInt;
-
-// Keys for active connection category
-
-/**
- * Iap Id of the active connection.
- * If set to zero then no active connection
- */
-const TUint KMPMPSKeyActiveConnectionIap = 10003;
-
-/**
- * Snap Id of the active connection.
- * If set to zero then possible iap connection
- */
-const TUint KMPMPSKeyActiveConnectionSnap = 10004;
-
-/**
- * Possible values:
- * 0,
- * KCommDbBearerVirtual,
- * KCommDbBearerWLAN,
- * KCommDbBearerWcdma,
- * KCommDbBearerUnknown,
- */
-const TUint KMPMPSKeyActiveConnectionBearer = 10005;
-
-// Read policy, no capabilities required
-// This format is used instead of _LIT_SECURITY_POLICY_PASS, which 
-// produces pclint warnings
-_LIT_SECURITY_POLICY_C1( KMPMActiveConnectionReadPolicy, ECapability_None );
-
-// Write policy
-_LIT_SECURITY_POLICY_C1( KMPMActiveConnectionWritePolicy, ECapabilityNetworkControl );
-
 // MACROS
 _LIT( KPanicCategory, "MPM Client" );
 

--- a/bearermanagement/mpm/src/mpmcommsdataccess.cpp	Fri Apr 16 15:21:37 2010 +0300
+++ b/bearermanagement/mpm/src/mpmcommsdataccess.cpp	Mon May 03 12:53:07 2010 +0300
@@ -235,13 +235,6 @@
 
                 TUint32 presumedIapId = aIapId; 
 
-                // Find and change Iap and Net Id if SSID exist
-                //
-                if ( !CheckEasyWLanL( aIapId ) )
-                    {
-                    aSession.MyServer().Events()->FindSSID( ssid, aIapId, aNetId );
-                    }
-
                 // Store Iap Id, Net Id and empty APN to TConnInfo, 
                 // so that FindAPN can utilise the information 
                 // during the validation of next IAP to support 
@@ -416,125 +409,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CMPMCommsDatAccess::CheckEasyWLanL
-// -----------------------------------------------------------------------------
-//
-TBool CMPMCommsDatAccess::CheckEasyWLanL( TUint32 aIapId ) const
-    {
-    MPMLOGSTRING2( "CMPMCommsDatAccess::CheckEasyWLanL: IAP Id = %i", aIapId)
-
-    TBool easyWlan = EFalse;
-    CCommsDatabase* commsDatabase = CCommsDatabase::NewL();
-    CleanupStack::PushL( commsDatabase );
-
-    // Make hidden records visible
-    // 
-    commsDatabase->ShowHiddenRecords();
-
-    CCommsDbTableView* commsDbIapTableView = 
-        commsDatabase->OpenViewMatchingUintLC( TPtrC( IAP ),
-                                               TPtrC( COMMDB_ID ),
-                                               aIapId );
-
-    User::LeaveIfError( commsDbIapTableView->GotoFirstRecord() );
-
-    TInt length1( 0 );
-
-    commsDbIapTableView->ReadColumnLengthL( TPtrC( IAP_SERVICE_TYPE ), 
-                                            length1 );
-
-    HBufC* buf1 = HBufC::NewLC( length1 );
-    TPtr ptr1( buf1->Des() );
-
-    // Read IAP's service type
-    //
-    commsDbIapTableView->ReadTextL(TPtrC( IAP_SERVICE_TYPE ), ptr1 );
-    MPMLOGSTRING2(
-        "CMPMCommsDatAccess::CheckEasyWLanL: IAP service type = %S", &ptr1 )
-
-    if ( ptr1.Compare( TPtrC( LAN_SERVICE ) ) == KErrNone )
-        {
-        TUint32 service( 0 );
-        commsDbIapTableView->ReadUintL( TPtrC( IAP_SERVICE ), service );
-
-        // Now open a view to LAN_SERVICE table
-        //
-        CCommsDbTableView* commsDbLanTableView = 
-            commsDatabase->OpenViewMatchingUintLC( TPtrC( LAN_SERVICE ),
-                                                   TPtrC( COMMDB_ID ),
-                                                   service );
-
-        User::LeaveIfError( commsDbLanTableView->GotoFirstRecord() );
-
-        TUint32 commDbId( 0 );
-
-        commsDbLanTableView->ReadUintL( TPtrC( COMMDB_ID ), commDbId );
-
-        // Now open a view to WLAN_SERVICE table
-        //
-        // If non wlan product, wlan tables won't exist and this will 
-        // leave. In that case do not check WLAN related issues 
-        //
-        CCommsDbTableView* commsDbWlanTableView( NULL );
-        TRAPD( err2, commsDbWlanTableView =
-                     commsDatabase->OpenViewMatchingUintLC( TPtrC( WLAN_SERVICE ),
-                                                            TPtrC( WLAN_SERVICE_ID ),
-                                                            commDbId );
-                     CleanupStack::Pop( commsDbWlanTableView ) );
-        if ( err2 == KErrNone )
-            {
-            // Push back to cleanup stack. Object must be popped within 
-            // TRAP, to avoid unbalance in cleanup stack and panic 71
-            CleanupStack::PushL( commsDbWlanTableView );
-
-            TInt err = commsDbWlanTableView->GotoFirstRecord();
-
-            if ( err == KErrNone )
-                {
-                TInt ssidLength( 0 );
-                commsDbWlanTableView->ReadColumnLengthL( TPtrC( NU_WLAN_SSID ), 
-                                                                ssidLength );
-                if ( ssidLength == 0 )
-                    {
-                    MPMLOGSTRING(
-                        "CMPMCommsDatAccess::CheckEasyWLanL: IAP is Easy WLAN" )
-                    easyWlan = ETrue;
-                    }
-                else
-                    {
-                    MPMLOGSTRING(
-                        "CMPMCommsDatAccess::CheckEasyWLanL: IAP isn't Easy WLAN" )
-                    easyWlan = EFalse;
-                    }
-                }
-            else
-                {
-                MPMLOGSTRING2( "CMPMCommsDatAccess::CheckEasyWLanL\
- GotoFirstRecord returned %d", err )
-                }
-
-            // Release memory
-            //
-            CleanupStack::PopAndDestroy( commsDbWlanTableView );
-            }
-        else
-            {
-            MPMLOGSTRING2(
-                        "CMPMCommsDatAccess::CheckEasyWLanL: WLAN table view failed, err %d", err2 )
-            }    
-        CleanupStack::PopAndDestroy( commsDbLanTableView );
-        }
-
-    // Release memory
-    //
-    CleanupStack::PopAndDestroy( buf1 );
-    CleanupStack::PopAndDestroy( commsDbIapTableView );
-    CleanupStack::PopAndDestroy( commsDatabase );
-
-    return easyWlan;
-    }
-
-// -----------------------------------------------------------------------------
 // CMPMCommsDatAccess::DumpIAPsL
 // -----------------------------------------------------------------------------
 //
@@ -1034,317 +908,6 @@
     CleanupStack::PopAndDestroy( table );
     CleanupStack::PopAndDestroy( commsDatabase );
     }
-        
-// -----------------------------------------------------------------------------
-// CMPMCommsDatAccess::CheckWLANIapWithSsidL
-// -----------------------------------------------------------------------------
-//
-
-TUint32 CMPMCommsDatAccess::CheckWLANIapWithSsidL( TWlanSsid& aSsid, 
-                                                   TUint32 aSecMode,
-                                                   TWlanNetMode aConnMode )
-    {
-    MPMLOGSTRING( "CMPMCommsDatAccess::CheckWLANIapWithSsidL" )
-    TUint iapId( 0 );
-
-    // Creating a session with the latest version
-    //     
-    CMDBSession* db = CMDBSession::NewLC( KCDVersion1_1 );
-
-    db->SetAttributeMask( ECDHidden | ECDProtectedWrite );
-
-    // Find Wlan service record
-    //
-    TBuf<KWlanMaxSsidLength> ssid16;
-    CnvUtfConverter::ConvertToUnicodeFromUtf8( ssid16, aSsid );
-    MPMLOGSTRING4( "CMPMCommsDatAccess::CheckWLANIapWithSsidL sec:%d, conn:%d ssid %S", 
-                   aSecMode, 
-                   aConnMode, 
-                   &ssid16 )
-    CMDBRecordSet<CCDWlanServiceRecord>* wlanSet = 
-        new ( ELeave ) CMDBRecordSet<CCDWlanServiceRecord>( 
-         CCDWlanServiceRecord::TableIdL( *db ) );
-    CleanupStack::PushL( wlanSet ); 
-
-    CCDWlanServiceRecord* wlanRecord = new ( ELeave ) 
-        CCDWlanServiceRecord( CCDWlanServiceRecord::TableIdL( *db ) );
-
-    CleanupStack::PushL( wlanRecord ); 
-    wlanSet->LoadL( *db );
-    
-    MPMLOGSTRING2( "CMPMCommsDatAccess::CheckWLANIapWithSsidL, record count:%d", 
-                   wlanSet->iRecords.Count() )
-    TBool matchFound( EFalse );
-    for (TInt i = 0; ( i < wlanSet->iRecords.Count() ) && !matchFound; i++ )
-        {
-        wlanRecord->SetElementId( GetRealElementId( wlanSet->iRecords[i] ) );
-        wlanRecord->LoadL( *db );
-        TBuf<KWlanMaxSsidLength> ssid;
-        ssid = wlanRecord->iWLanSSID;
-        //if not easywlan, continue
-        //
-        if( ssid.Compare( KNullDesC() ) )
-            {
-            ssid = wlanRecord->iWLanSSID.GetL();
-            TUint32 secMode = wlanRecord->iWlanSecMode;
-            TUint32 connMode = wlanRecord->iWlanConnMode;
-        
-            if ( connMode )
-                {
-                connMode = 1;    
-                }
-            MPMLOGSTRING3( "CMPMCommsDatAccess::CheckWLANIapWithSsidL CommsDat secmode:%d, connmode:%d ", 
-        				   secMode, 
-        				   connMode )
-
-            if ( !ssid.Compare( ssid16 ) && ( aConnMode == connMode ) )
-        	    {
-        	    //compare sec mode
-        	    if ( aSecMode == EWlanSecModeOpen || aSecMode == EWlanSecModeWep )
-        		    {
-        		    if ( aSecMode == secMode )
-        		        {
-        		        MPMLOGSTRING( "CMPMCommsDatAccess::CheckWLANIapWithSsidL match found, open/wep " )
-        		        matchFound = ETrue;
-        		        }
-        			    
-        		    }
-            	//WPA PSK case
-            	else if ( aSecMode == EWlanSecModeWpa2 )
-            		{
-        	    	if ( ( secMode > EWlanSecModeWep ) && (wlanRecord->iWlanEnableWpaPsk) )
-        	    	    {
-        	    	    MPMLOGSTRING( "CMPMCommsDatAccess::CheckWLANIapWithSsidL match found, wpa psk " )
-        	    	    matchFound = ETrue;
-        	    	    }
-            		}
-            	//aSecMode = EWlanSecModeWpa
-            	else
-            		{
-        	    	if ( secMode > EWlanSecModeWep )
-        	    	    {
-        	    	    MPMLOGSTRING( "CMPMCommsDatAccess::CheckWLANIapWithSsidL match found, wpa " )
-        	    	    matchFound = ETrue;
-        	    	    }
-            		}
-        			
-        		}
-        	}
-        }
-    
-    if ( matchFound )
-        {
-        // load Iap record
-        //
-        CCDIAPRecord* iapRecord = static_cast<CCDIAPRecord*> ( 
-            CCDRecordBase::RecordFactoryL( KCDTIdIAPRecord ) );
-        CleanupStack::PushL( iapRecord );
-
-        CCDLANServiceRecord* lanRecord = static_cast<CCDLANServiceRecord*> (
-            CCDRecordBase::RecordFactoryL( KCDTIdLANServiceRecord ));
-        CleanupStack::PushL( lanRecord );
-        
-        iapRecord->iServiceType.SetL( TPtrC( KCDTypeNameLANService ) );
-        
-        lanRecord->SetRecordId( wlanRecord->iWlanServiceId );
-        lanRecord->LoadL( *db );
-
-        iapRecord->iService = lanRecord->ElementId();
-
-/*        iapRecord->iServiceType.SetL( TPtrC( KCDTypeNameLANService ) );
-        iapRecord->iService = wlanRecord->iWlanServiceId;
-*/
-        if( iapRecord->FindL( *db ) )
-            {
-            MPMLOGSTRING( "CMPMCommsDatAccess::CheckWLANIapWithSsidL iap found" )
-            // Iap record found
-            //
-            iapId = iapRecord->RecordId();
-            }
-        CleanupStack::PopAndDestroy( lanRecord );
-        CleanupStack::PopAndDestroy( iapRecord );
-        }
-    CleanupStack::PopAndDestroy( wlanRecord );
-    CleanupStack::PopAndDestroy( wlanSet );
-    CleanupStack::PopAndDestroy( db );
-    
-    return iapId;
-    }
-
-// -----------------------------------------------------------------------------
-// CMPMCommsDatAccess::SetEasyWlanDataL
-// -----------------------------------------------------------------------------
-//
-void CMPMCommsDatAccess::SetEasyWlanDataL( const TWlanSsid& aSsid,
-                                           TUint            aSecMode,
-                                           TWlanNetMode     aConnMode,
-                                           TWepKeyData      aWepData,
-                                           TUint            aEnableWpaPsk,
-                                           const TDesC8&    aWpaPsk,
-                                           TUint            aWpaKeyLen )
-    {
-    MPMLOGSTRING( "CMPMCommsDatAccess::SetEasyWlanDataL" )
-    CMDBSession* dbSession = CMDBSession::NewL( KCDVersion1_1 );
-    CleanupStack::PushL(dbSession);
-
-    // Try to open a transaction to obtain write lock
-    dbSession->OpenTransactionL();
-
-    TUint32 wlanId = FindEasyWlanServiceIdL( dbSession );
-    if( !wlanId )
-        {
-        MPMLOGSTRING( "CMPMCommsDatAccess::SetEasyWlanDataL unable to store \
- easy wlan settings" )
-        dbSession->Close();		
-		CleanupStack::PopAndDestroy( dbSession );
-        return;
-        }
-    
-    CMDBGenericRecord* record = static_cast<CMDBGenericRecord*> 
-				    ( CCDRecordBase::RecordFactoryL( 0));
-    CleanupStack::PushL( record );
-    record->InitializeL( TPtrC( WLAN_SERVICE ),NULL );
-    record->SetRecordId( wlanId );
-    record->LoadL( *dbSession );
-
-        TBuf<KWlanMaxSsidLength> ssid16;
-        CnvUtfConverter::ConvertToUnicodeFromUtf8( ssid16, aSsid );
-        CMDBField<TDesC>* textField = (CMDBField<TDesC>*)record->GetFieldByIdL(KCDTIdWlanUsedSSID);
-        textField->SetMaxLengthL( ssid16.Length());
-        textField->SetL( ssid16 );
-    
-        *((CMDBField<TUint32>*)record->GetFieldByIdL(KCDTIdWlanSecMode)) = aSecMode;
-        *((CMDBField<TUint32>*)record->GetFieldByIdL(KCDTIdWlanConnMode)) = aConnMode;
-    
-        if (aEnableWpaPsk)
-    	    {
-    	    MPMLOGSTRING( "CMPMCommsDatAccess::SetEasyWlanDataL wpa psk" )
-    	    CMDBField<TDesC8>* binField = (CMDBField<TDesC8>*)
-		   									record->GetFieldByIdL(KCDTIdWlanWpaPreSharedKey);
-		    binField->SetMaxLengthL( aWpaKeyLen );
-		    binField->SetL( aWpaPsk );
-
-		    *((CMDBField<TUint32>*)record->GetFieldByIdL(KCDTIdWlanWpaKeyLength)) = aWpaKeyLen;
-		    *((CMDBField<TUint32>*)record->GetFieldByIdL(KCDTIdWlanEnableWpaPsk)) = aEnableWpaPsk;
-    	    }
-        else if (aSecMode == EWlanSecModeWep)
-    	    {
-    	    MPMLOGSTRING( "CMPMCommsDatAccess::SetEasyWlanDataL wep psk" )
-     	    *((CMDBField<TUint32>*)record->GetFieldByIdL( KCDTIdWlanWepIndex )) = 
-     	        aWepData.iDefaultWep;
- 
-    	    SetWepKeyL( KCDTIdWlanFormatKey1, KCDTIdWlanWepKey1, 
-    	                aWepData.iWep1, aWepData.iWepFormat1, record );
-            SetWepKeyL( KCDTIdWlanFormatKey2, KCDTIdWlanWepKey2, 
-                        aWepData.iWep2, aWepData.iWepFormat2, record );
-            SetWepKeyL( KCDTIdWlanFormatKey3, KCDTIdWlanWepKey3, 
-                        aWepData.iWep3, aWepData.iWepFormat3, record );
-            SetWepKeyL( KCDTIdWlanFormatKey4, KCDTIdWlanWepKey4, 
-                        aWepData.iWep4, aWepData.iWepFormat4, record );
-    	    }
-    	else
-    	    {
-    	    MPMLOGSTRING2( "CMPMCommsDatAccess::SetEasyWlanDataL sec mode %d, no key data written",
-    	         aSecMode )
-    	    }
-    
-        //Finally save all to commsdat.
-        record->ModifyL( *dbSession );
-        dbSession->CommitTransactionL();
-        dbSession->Close();
-        CleanupStack::PopAndDestroy( record );
-        CleanupStack::PopAndDestroy( dbSession );
-    }
-
-// -----------------------------------------------------------------------------
-// CMPMCommsDatAccess::SetWepKeyL
-// -----------------------------------------------------------------------------
-//
-void CMPMCommsDatAccess::SetWepKeyL( TMDBElementId       aFormatId,
-                                     TMDBElementId       aKeyId, 
-                                     TWlanWepKey         aWepKey,
-                                     TUint               aWepFormat,
-                                     CMDBGenericRecord*  aRecord )
-    {
-    CMDBField<TUint32>* formatField = static_cast<CMDBField<TUint32>*>
-            ( aRecord->GetFieldByIdL( aFormatId ) );
-    formatField->SetL( aWepFormat );
-    CMDBField<TDesC8>* wepKey = static_cast<CMDBField<TDesC8>*>
-            ( aRecord->GetFieldByIdL( aKeyId ) );
-    if ( aWepFormat )
-        {
-        wepKey->SetL( aWepKey );
-        }
-    else
-        {
-        //Convert Ascii to Hex format, as only Hex value to be stored in CommsDat
-        HBufC8* buf8Conv = HBufC8::NewLC( aWepKey.Length() * KMpmDoubleLength );
-        ConvertAsciiToHex( aWepKey, buf8Conv );
-        wepKey->SetL( buf8Conv->Des() );
-        CleanupStack::PopAndDestroy( buf8Conv );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CMPMCommsDatAccess::ConvertAsciiToHex
-// -----------------------------------------------------------------------------
-//
-void CMPMCommsDatAccess::ConvertAsciiToHex( const TDesC8& aSource, 
-        							        HBufC8* aDest )
-    {
-    MPMLOGSTRING( "CMPMCommsDatAccess::ConvertAsciiToHex" )
-    _LIT( hex, "0123456789ABCDEF" );
-    TInt size = aSource.Size();
-    TPtr8 ptr = aDest->Des();
-    for ( TInt ii = 0; ii < size; ii++ )
-    	{
-    	TText8 ch = aSource[ii];
-    	ptr.Append( hex()[(ch/16)&0x0f] );
-    	ptr.Append( hex()[ch&0x0f] );
-    	}
-    }
-
-// -----------------------------------------------------------------------------
-// CMPMCommsDatAccess::FindEasyWlanServiceIdL
-// -----------------------------------------------------------------------------
-//
-TUint32 CMPMCommsDatAccess::FindEasyWlanServiceIdL( CMDBSession* aDb )
-    {
-    // if the method returns the record container there is for 
-    // some reason garbage data in the key values
-    //
-    TUint32 wlanId( 0 );
-    MPMLOGSTRING( "CMPMCommsDatAccess::FindEasyWlanServiceIdL" )    
-
-    CMDBRecordSet<CCDWlanServiceRecord>* wlanSet = 
-        new ( ELeave ) CMDBRecordSet<CCDWlanServiceRecord>( 
-         CCDWlanServiceRecord::TableIdL( *aDb ) );
-    CleanupStack::PushL( wlanSet ); 
-    wlanSet->LoadL( *aDb );
-    
-    TBool found( EFalse );
-    for ( TInt i = 0; i < wlanSet->iRecords.Count() && !found; i++ )
-        {
-        CCDWlanServiceRecord* wlanRecord = new ( ELeave ) 
-            CCDWlanServiceRecord( CCDWlanServiceRecord::TableIdL( *aDb ) );
-        CleanupStack::PushL( wlanRecord );
-
-        wlanRecord->SetElementId( GetRealElementId( wlanSet->iRecords[i] ) );
-        wlanRecord->LoadL( *aDb );
-        
-        TDesC ssid = wlanRecord->iWLanSSID;
-        if( !ssid.Compare( KNullDesC() ) )
-            {
-            MPMLOGSTRING2( "CMPMCommsDatAccess::FindEasyWlanServiceIdL: \
-found service entry %i", wlanRecord->RecordId() )
-            wlanId = wlanRecord->RecordId();
-            found = ETrue;
-            }
-        CleanupStack::PopAndDestroy( wlanRecord );
-        }
-    CleanupStack::PopAndDestroy( wlanSet );
-    return wlanId;
-    }
 
 // -----------------------------------------------------------------------------
 // CMPMCommsDatAccess::CheckHiddenAgentL
@@ -1753,12 +1316,6 @@
                 TInt ssidLength( 0 );
                 commsDbWlanTableView->ReadColumnLengthL( TPtrC( NU_WLAN_SSID ), 
                                                      ssidLength );
-                if ( ssidLength == 0 )
-                    {
-                    MPMLOGSTRING(
-                        "CMPMCommsDatAccess::CheckWlanL: IAP is Easy WLAN" )
-                    wlan = EEasyWlanIap;
-                    }
                 }
             else
                 {
@@ -2325,7 +1882,26 @@
 
             TMpmConnPref tempMpmConnPref;
             tempMpmConnPref.SetSnapId( snap );
-            aSession.IapSelectionL()->ChooseBestIAPL( tempMpmConnPref, aAvailableIAPList );
+
+            // Ensure that there will be no infinite loops by dropping
+            // this virtual iap out from the list of available iaps.
+            // E.g. next layer SNAP could be the same as current SNAP.
+            RAvailableIAPList tempList;
+            CleanupClosePushL( tempList );
+              
+            for( TInt i=0; i < aAvailableIAPList.Count(); i++ )
+                {
+                // drop this virtual iap out from the list of
+                // available iaps to prevent from infinitely looping
+                //	
+                if ( aAvailableIAPList[i] != aVirtualIapId )
+                    {
+                    tempList.Append( aAvailableIAPList[i] );
+                    }
+                }
+            aSession.IapSelectionL()->ChooseBestIAPL( tempMpmConnPref, tempList );
+            CleanupStack::PopAndDestroy( &tempList );
+
             aRealIapId = tempMpmConnPref.IapId();
             }
         else if ( virtualNext->iNextLayerIAP != 0 )
@@ -2344,10 +1920,18 @@
                 MPMLOGSTRING(
                     "CMPMCommsDatAccess::FindRealIapL: Call FindRealIapL" )
 
-                FindRealIapL( iap2->RecordId(), 
-                              aRealIapId, 
-                              aAvailableIAPList,
-                              aSession );
+                if ( aVirtualIapId != virtualNext->iNextLayerIAP )
+                    {
+                    FindRealIapL( iap2->RecordId(), 
+                                  aRealIapId, 
+                                  aAvailableIAPList,
+                                  aSession );
+                    }
+                else
+                    {
+                    aRealIapId = 0;
+                    MPMLOGSTRING( "CMPMCommsDatAccess::FindRealIapL: Virtual iap points to itself" )
+                    }
                 }
             else
                 {
@@ -2668,201 +2252,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CMPMCommsDatAccess::AreActiveIapsInSameSnapL
-// -----------------------------------------------------------------------------
-//
-TBool CMPMCommsDatAccess::AreActiveIapsInSameSnapL ( RArray<TActiveBMConn>& aActiveBMConns,
-                                                     TUint32& aSnapId )
-    {
-    MPMLOGSTRING( "CMPMCommsDatAccess::AreActiveIapsInSameSnapL" )
-    TBool same = ETrue;
-    TUint32 snapId = 0;
-    TUint32 prevSnapId = 0;
-            
-    // Go through all active connections
-    for (TInt index = 0; index < aActiveBMConns.Count(); index++ )
-        {
-        // Do check only for active connections
-        if ( aActiveBMConns[index].iConnInfo.iState != EStarted )
-            {
-            continue;
-            }
-        
-        // Iap id must be nonzero
-        if ( aActiveBMConns[index].iConnInfo.iIapId )
-            {
-            prevSnapId = snapId;
-            // Get destination id for the iap
-            snapId = GetSnapIdL( aActiveBMConns[index].iConnInfo.iIapId );
-                        
-            // Check if previous iap's destination is different
-            if ( ( ( prevSnapId != snapId ) && prevSnapId && snapId ) ||
-                 !snapId )
-                {
-                // Set return value to false and leave loop
-                same = EFalse;
-                break;
-                }
-            }
-        }
-    
-    // Return destId for later use
-    aSnapId = snapId;
-    
-    return same;
-    }
-
-// -----------------------------------------------------------------------------
-// CMPMCommsDatAccess::SelectActiveConnectionL
-// -----------------------------------------------------------------------------
-//
-void CMPMCommsDatAccess::SelectActiveConnectionL ( const TUint32 aSnapId,
-                                                   RArray<TActiveBMConn>& aActiveBMConns,
-                                                   TUint32& aActiveIapId,
-                                                   TUint32& aActiveSnapId,
-                                                   TMPMBearerType& aActiveBearerType,
-                                                   CMPMServerSession& aSession )
-    {
-    MPMLOGSTRING( "CMPMCommsDatAccess::SelectActiveConnectionL" )
-    RArray<TUint32> activeIaps;
-    RArray<TNetIap> iapIds;
-    
-    // Reset output parameters
-    aActiveIapId = 0;
-    aActiveSnapId = 0;
-    aActiveBearerType = EMPMBearerTypeNone;
-
-    CleanupClosePushL( activeIaps );
-        
-    for (TInt index = 0; index < aActiveBMConns.Count(); index++ )
-        {
-        CMPMServerSession* serverSession = 
-            aSession.MyServer().GetServerSession(
-                aActiveBMConns[index].iConnInfo.iConnId );
-
-        // Add only started iaps to array
-        if ( aActiveBMConns[index].iConnInfo.iState == EStarted &&
-             serverSession->ChooseBestIapCalled() )
-            {
-            activeIaps.AppendL ( aActiveBMConns[index].iConnInfo.iIapId );
-            }
-        }
-        
-    CleanupClosePushL( iapIds );
-    SearchDNEntriesL( aSnapId, iapIds );
-    
-    // Remove any deactived IAP from iapIds
-    TInt ret        = KErrNotFound;
-    TInt destCount  = iapIds.Count();
-    
-    // Decrement by one, because count is n, 
-    // but indexes in array are 0 .. n-1.
-    // 
-    destCount--;
-
-    // This time we are browsing the array from the end to the beginning, 
-    // because removing one element from array affects index numbering.
-    for ( TInt k = destCount; k >= 0; k-- )
-        {
-        ret = activeIaps.Find( iapIds[k].iIapId );
-        if ( ret == KErrNotFound )
-            {
-            MPMLOGSTRING2( "CMPMCommsDatAccess::SelectActiveConnectionL: \
-Remove deactived IAP = %i", iapIds[k].iIapId )
-            iapIds.Remove( k );
-            }
-        }
-
-    // Determine the actual priorities for IAPs
-    DeterminePrioritiesL( iapIds, activeIaps, aSession );
-
-    // Check if a matching available IAP is found.
-    if( iapIds.Count() )
-        {
-        // Go through all iaps
-        for ( TInt index = 0; index < iapIds.Count(); index++ )
-            {
-            // Get bearer type
-            TMPMBearerType bearerType = GetBearerTypeL( iapIds[index].iIapId );
-        
-            // If iap is not vpn, wlan or packet then skip it
-            if ( bearerType == EMPMBearerTypeOther )
-                {
-                continue;
-                }
-            
-            // Set bearer type, iap id and snap id
-            for (TInt index2 = 0; index2 < aActiveBMConns.Count(); index2++ )
-                {
-                if ( ( aActiveBMConns[index2].iConnInfo.iIapId ==
-                       iapIds[index].iIapId ) )
-                    {
-                    if ( aSession.MyServer().DedicatedClients().Find(
-                         aActiveBMConns[index2].iConnInfo.iAppUid ) != KErrNone )
-                        {
-                        aActiveSnapId = aActiveBMConns[index2].iConnInfo.iSnap;
-                        aActiveIapId = aActiveBMConns[index2].iConnInfo.iIapId;
-                        aActiveBearerType = bearerType;
-                        }
-                    break;
-                    }
-                }
-            
-            break;
-            }
-        }
-
-    MPMLOGSTRING4(
-        "CMPMCommsDatAccess::SelectActiveConnectionL: Iap id = %i, Snap id = %i, \
-Bearer type = %i",
-        aActiveIapId, aActiveSnapId, aActiveBearerType )
-    
-    CleanupStack::PopAndDestroy( &iapIds );
-    CleanupStack::PopAndDestroy( &activeIaps );
-    }
-    
-// -----------------------------------------------------------------------------
-// CMPMCommsDatAccess::GetSnapIdL
-// -----------------------------------------------------------------------------
-//
-TUint32 CMPMCommsDatAccess::GetSnapIdL( TUint32 aIapId )
-    {
-    MPMLOGSTRING( "CMPMCommsDatAccess::GetSnapIdL" )
-    TUint32 snapId = 0;
-    RArray<TUint> snapIds;
-        
-    CleanupClosePushL( snapIds );
-    // Get destinations
-    FindAllSnapsL( snapIds );
-
-    for (TInt index = 0; index < snapIds.Count(); index++)
-        {
-        RArray<TNetIap> ids;
-        // Get iaps belonging to this snap
-        CleanupClosePushL( ids );
-        SearchDNEntriesL( snapIds[index], ids );
-            
-        for (TInt index2 = 0; index2 < ids.Count(); index2++)
-            {
-            // Check if iap belongs to this destination
-            if (ids[index2].iIapId == aIapId)
-                {
-                snapId = snapIds[index];
-                CleanupStack::PopAndDestroy( &ids );                    
-                CleanupStack::PopAndDestroy( &snapIds );
-                return snapId;
-                }
-            }
-        
-        CleanupStack::PopAndDestroy( &ids );
-        }
-
-    CleanupStack::PopAndDestroy( &snapIds );
-    
-    return snapId;
-    }
-
-// -----------------------------------------------------------------------------
 // CMPMCommsDatAccess::IsSnapEmptyL
 // -----------------------------------------------------------------------------
 //