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

diff -r b7e70c0792e6 -r e0bc3c7066a2 XDMSettingsUI/group/XDMPlugin.mmp
--- a/XDMSettingsUI/group/XDMPlugin.mmp	Fri Apr 16 15:21:55 2010 +0300
+++ b/XDMSettingsUI/group/XDMPlugin.mmp	Mon May 03 12:53:21 2010 +0300
@@ -68,7 +68,7 @@
 
 LIBRARY             egul.lib // CGulIcon
 LIBRARY             aknskins.lib // AknsUtils.h
-LIBRARY             cmmanager.lib //Connection Method Manager
+
 LIBRARY             xdmsettingsapi.lib
 LIBRARY             gsecomplugin.lib //GS Ecom plugin
 
diff -r b7e70c0792e6 -r e0bc3c7066a2 XDMSettingsUI/inc/XDMPluginSettinglist.h
--- a/XDMSettingsUI/inc/XDMPluginSettinglist.h	Fri Apr 16 15:21:55 2010 +0300
+++ b/XDMSettingsUI/inc/XDMPluginSettinglist.h	Mon May 03 12:53:21 2010 +0300
@@ -24,7 +24,6 @@
 // INCLUDE FILES
 #include <coecntrl.h>
 #include <aknsettingitemlist.h>
-#include <cmmanagerext.h>
 
 // FORWARD DECLARATIONS
 class CSettingsData;
@@ -129,12 +128,6 @@
          */
         CSettingsData& iSettingsData;
         
-        /**
-         * Handle to connection method manager.
-         * Own.
-         */
-        RCmManagerExt iCmManagerExt;
-      
     };
 
 #endif // CXDMPLUGINSETTINGLIST_H
diff -r b7e70c0792e6 -r e0bc3c7066a2 XDMSettingsUI/src/XDMPluginSettinglist.cpp
--- a/XDMSettingsUI/src/XDMPluginSettinglist.cpp	Fri Apr 16 15:21:55 2010 +0300
+++ b/XDMSettingsUI/src/XDMPluginSettinglist.cpp	Mon May 03 12:53:21 2010 +0300
@@ -22,7 +22,6 @@
 #include "XDMExternalInterface.h"
 
 #include <barsread.h>
-#include <cmconnectionmethodext.h>
 #include <avkon.loc>
 #include <StringLoader.h>
 #include <akntitle.h>
@@ -61,7 +60,6 @@
 // 
 void CXDMPluginSettinglist::ConstructL()
     {
-    iCmManagerExt.OpenL();
     }
 
 // -----------------------------------------------------------------------------
@@ -80,7 +78,6 @@
 // 
 CXDMPluginSettinglist::~CXDMPluginSettinglist()
   {
-  iCmManagerExt.Close();
   }
 
 // -----------------------------------------------------------------------------
@@ -255,26 +252,14 @@
     #endif
     if ( aAP > KErrNotFound )
         {
-        RCmConnectionMethodExt connMethod = iCmManagerExt.ConnectionMethodL( aAP );
-        CleanupClosePushL( connMethod );
-        
-        HBufC* connName = connMethod.GetStringAttributeL( CMManager::ECmName );
-        CleanupStack::PushL( connName );
-        
-        if ( KMaxAccessPointNameLength >= connName->Des().Length() )
-            {
-            aAccessPoint.Copy( connName->Des() );
-            }
-        else
-            {
-            aAccessPoint.Copy( connName->Des().Left( KMaxAccessPointNameLength ) );
-            }
-        
-        CleanupStack::PopAndDestroy( connName );
-        CleanupStack::PopAndDestroy( &connMethod );
+        /**
+         * RCmConnectionMethodExt, RCmManagerExt ect... was removed due to 
+         * Extended Connection Settings API deprecation.
+         * Clients should use Connection Settings (public) API instead
+         */
+        aAccessPoint.Copy( KNullDesC );
         #ifdef _DEBUG  
-        RDebug::Print( _L( "CXDMPluginSettinglist::GetAccessPointNameL - Name: %S"),
-                                &aAccessPoint );
+        RDebug::Print( _L( "CXDMPluginSettinglist::GetAccessPointNameL - Name: KNullDesC" ) );
         #endif
         }
     #ifdef _DEBUG