equal
deleted
inserted
replaced
20 |
20 |
21 // INCLUDE FILES |
21 // INCLUDE FILES |
22 #include "XDMExternalInterface.h" |
22 #include "XDMExternalInterface.h" |
23 |
23 |
24 #include <barsread.h> |
24 #include <barsread.h> |
25 #include <cmconnectionmethodext.h> |
|
26 #include <avkon.loc> |
25 #include <avkon.loc> |
27 #include <StringLoader.h> |
26 #include <StringLoader.h> |
28 #include <akntitle.h> |
27 #include <akntitle.h> |
29 #include <eikspane.h> |
28 #include <eikspane.h> |
30 |
29 |
59 // CXDMPluginSettinglist::ConstructL() |
58 // CXDMPluginSettinglist::ConstructL() |
60 // ----------------------------------------------------------------------------- |
59 // ----------------------------------------------------------------------------- |
61 // |
60 // |
62 void CXDMPluginSettinglist::ConstructL() |
61 void CXDMPluginSettinglist::ConstructL() |
63 { |
62 { |
64 iCmManagerExt.OpenL(); |
|
65 } |
63 } |
66 |
64 |
67 // ----------------------------------------------------------------------------- |
65 // ----------------------------------------------------------------------------- |
68 // CXDMPluginSettinglist::CXDMPluginSettinglist(CSettingsData &aData) |
66 // CXDMPluginSettinglist::CXDMPluginSettinglist(CSettingsData &aData) |
69 // ----------------------------------------------------------------------------- |
67 // ----------------------------------------------------------------------------- |
78 // CXDMPluginSettinglist::~CXDMPluginSettinglist() |
76 // CXDMPluginSettinglist::~CXDMPluginSettinglist() |
79 // ----------------------------------------------------------------------------- |
77 // ----------------------------------------------------------------------------- |
80 // |
78 // |
81 CXDMPluginSettinglist::~CXDMPluginSettinglist() |
79 CXDMPluginSettinglist::~CXDMPluginSettinglist() |
82 { |
80 { |
83 iCmManagerExt.Close(); |
|
84 } |
81 } |
85 |
82 |
86 // ----------------------------------------------------------------------------- |
83 // ----------------------------------------------------------------------------- |
87 // CXDMPluginSettinglist::SizeChanged() |
84 // CXDMPluginSettinglist::SizeChanged() |
88 // ----------------------------------------------------------------------------- |
85 // ----------------------------------------------------------------------------- |
253 #ifdef _DEBUG |
250 #ifdef _DEBUG |
254 RDebug::Print( _L( "CXDMPluginSettinglist::GetAccessPointNameL - IN" ) ); |
251 RDebug::Print( _L( "CXDMPluginSettinglist::GetAccessPointNameL - IN" ) ); |
255 #endif |
252 #endif |
256 if ( aAP > KErrNotFound ) |
253 if ( aAP > KErrNotFound ) |
257 { |
254 { |
258 RCmConnectionMethodExt connMethod = iCmManagerExt.ConnectionMethodL( aAP ); |
255 /** |
259 CleanupClosePushL( connMethod ); |
256 * RCmConnectionMethodExt, RCmManagerExt ect... was removed due to |
260 |
257 * Extended Connection Settings API deprecation. |
261 HBufC* connName = connMethod.GetStringAttributeL( CMManager::ECmName ); |
258 * Clients should use Connection Settings (public) API instead |
262 CleanupStack::PushL( connName ); |
259 */ |
263 |
260 aAccessPoint.Copy( KNullDesC ); |
264 if ( KMaxAccessPointNameLength >= connName->Des().Length() ) |
|
265 { |
|
266 aAccessPoint.Copy( connName->Des() ); |
|
267 } |
|
268 else |
|
269 { |
|
270 aAccessPoint.Copy( connName->Des().Left( KMaxAccessPointNameLength ) ); |
|
271 } |
|
272 |
|
273 CleanupStack::PopAndDestroy( connName ); |
|
274 CleanupStack::PopAndDestroy( &connMethod ); |
|
275 #ifdef _DEBUG |
261 #ifdef _DEBUG |
276 RDebug::Print( _L( "CXDMPluginSettinglist::GetAccessPointNameL - Name: %S"), |
262 RDebug::Print( _L( "CXDMPluginSettinglist::GetAccessPointNameL - Name: KNullDesC" ) ); |
277 &aAccessPoint ); |
|
278 #endif |
263 #endif |
279 } |
264 } |
280 #ifdef _DEBUG |
265 #ifdef _DEBUG |
281 RDebug::Print( _L( "CXDMPluginSettinglist::GetAccessPointNameL - OUT id: %d:" ), |
266 RDebug::Print( _L( "CXDMPluginSettinglist::GetAccessPointNameL - OUT id: %d:" ), |
282 aAP ); |
267 aAP ); |