--- a/bearermanagement/mpm/inc/mpmserver.inl	Tue Aug 31 15:35:44 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmserver.inl	Wed Sep 01 12:23:51 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2007-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"
@@ -72,6 +72,15 @@
     }
 
 // -----------------------------------------------------------------------------
+// CMPMServer::DisconnectQueue
+// -----------------------------------------------------------------------------
+//
+inline CArrayPtrFlat<CMPMDisconnectDlg>* CMPMServer::DisconnectQueue()
+    {
+    return iDisconnectQueue;
+    }
+
+// -----------------------------------------------------------------------------
 // CMPMServer::RoamingQueue
 // -----------------------------------------------------------------------------
 //
@@ -90,6 +99,52 @@
     }
 
 // -----------------------------------------------------------------------------
+// CMPMServer::RemoveFromWlanQueryQueue
+// -----------------------------------------------------------------------------
+//
+inline void CMPMServer::RemoveFromWlanQueryQueue( CMPMWlanQueryDialog* aDlg )
+    {
+    for ( TInt i = 0; i < iWlanQueryQueue->Count(); i++ )
+        {
+        if ( iWlanQueryQueue->At( i ) == aDlg )
+            {
+            iWlanQueryQueue->Delete( i );
+            break;
+            }
+        }
+    }
+
+// -----------------------------------------------------------------------------
+// CMPMServer::WlanQueryQueue
+// -----------------------------------------------------------------------------
+//
+inline CArrayPtrFlat<CMPMWlanQueryDialog>* CMPMServer::WlanQueryQueue()
+    {
+    return iWlanQueryQueue;
+    }
+
+// -----------------------------------------------------------------------------
+// CMPMServer::FirstInWlanQueryQueue
+// -----------------------------------------------------------------------------
+//
+inline CMPMWlanQueryDialog* CMPMServer::FirstInWlanQueryQueue()
+    {
+    if ( iWlanQueryQueue->Count() == 0 )
+        return NULL;
+    else
+        return iWlanQueryQueue->At( 0 );
+    }
+
+// -----------------------------------------------------------------------------
+// CMPMServer::ConnectDialogQueue
+// -----------------------------------------------------------------------------
+//
+inline CArrayPtrFlat<CMPMDialog>* CMPMServer::ConnectDialogQueue()
+    {
+    return iConnectDialogQueue;
+    }
+
+// -----------------------------------------------------------------------------
 // CMPMServer::IncrementConnections
 // -----------------------------------------------------------------------------
 //
@@ -186,15 +241,6 @@
     }
 
 // -----------------------------------------------------------------------------
-// CMPMServer::VpnToggleWatcher
-// -----------------------------------------------------------------------------
-//
-inline CMpmVpnToggleWatcher* CMPMServer::VpnToggleWatcher()
-    {
-    return iMpmVpnToggleWatcher;
-    }
-
-// -----------------------------------------------------------------------------
 // CMPMServer::DedicatedClients
 // -----------------------------------------------------------------------------
 //
@@ -216,21 +262,12 @@
 // CMPMServer::RoamingWatcher()
 // -----------------------------------------------------------------------------
 //
-inline CMPMRoamingWatcher* CMPMServer::RoamingWatcher() const
+CMPMRoamingWatcher* CMPMServer::RoamingWatcher() const
     {
     return iRoamingWatcher;
     }
 
 // -----------------------------------------------------------------------------
-// CMPMServer::ConnUiUtils()
-// -----------------------------------------------------------------------------
-//
-inline CConnectionUiUtilities* CMPMServer::ConnUiUtils() const
-    {
-    return iConnUiUtils;
-    }
-
-// -----------------------------------------------------------------------------
 // CMPMServer::DataUsageWatcher()
 // -----------------------------------------------------------------------------
 //