equal
deleted
inserted
replaced
28 #include <data_caging_path_literals.hrh> |
28 #include <data_caging_path_literals.hrh> |
29 #include <StringLoader.h> |
29 #include <StringLoader.h> |
30 #include <rconnmon.h> |
30 #include <rconnmon.h> |
31 #include <cmmanager.h> |
31 #include <cmmanager.h> |
32 #include <cmconnectionmethod.h> |
32 #include <cmconnectionmethod.h> |
|
33 #include <cmpluginwlandef.h> |
33 #include <utf.h> |
34 #include <utf.h> |
34 #include <wlanindicator.rsg> |
35 #include <wlanindicator.rsg> |
35 #include "wlanindicatorpluginimplementation.h" |
36 #include "wlanindicatorpluginimplementation.h" |
36 |
37 |
37 |
38 |
242 cmManager.OpenLC(); |
243 cmManager.OpenLC(); |
243 |
244 |
244 RCmConnectionMethod connMethod = cmManager.ConnectionMethodL( connectedIapId ); |
245 RCmConnectionMethod connMethod = cmManager.ConnectionMethodL( connectedIapId ); |
245 CleanupClosePushL( connMethod ); |
246 CleanupClosePushL( connMethod ); |
246 |
247 |
247 connName = connMethod.GetStringAttributeL( ECmName ); |
248 TUint32 easyWLANIapId = cmManager.EasyWlanIdL(); |
|
249 if ( easyWLANIapId != connectedIapId ) |
|
250 { |
|
251 connName = connMethod.GetStringAttributeL( ECmName ); |
|
252 } |
|
253 else |
|
254 { |
|
255 connName = connMethod.GetStringAttributeL( EWlanUsedSSID ); |
|
256 } |
248 |
257 |
249 CleanupStack::PopAndDestroy( 2, &cmManager ); //cmManager and connMethod |
258 CleanupStack::PopAndDestroy( 2, &cmManager ); //cmManager and connMethod |
250 |
259 |
251 return connName; |
260 return connName; |
252 } |
261 } |