--- a/connectivitymodules/SeCon/services/csc/src/caputils.cpp Mon Jun 21 16:36:59 2010 +0300
+++ b/connectivitymodules/SeCon/services/csc/src/caputils.cpp Thu Jul 15 19:35:12 2010 +0300
@@ -198,12 +198,23 @@
mobilePhone.GetCurrentNetwork(
status, mobilePhoneNetworkInfoPckg, mobilePhoneLocationArea );
User::WaitForRequest( status );
- User::LeaveIfError( status.Int() );
+ User::LeaveIfError( status.Int() );
}
CleanupStack::PopAndDestroy( &mobilePhone );
CleanupStack::PopAndDestroy( &server );
- StrCopy( aLongName, mobilePhoneNetworkInfo.iLongName );
+ if ( mobilePhoneNetworkInfo.iLongName.Length() > 0 )
+ {
+ StrCopy( aLongName, mobilePhoneNetworkInfo.iLongName );
+ }
+ else if ( mobilePhoneNetworkInfo.iShortName.Length() > 0 )
+ {
+ StrCopy( aLongName, mobilePhoneNetworkInfo.iShortName );
+ }
+ else
+ {
+ StrCopy( aLongName, mobilePhoneNetworkInfo.iDisplayTag );
+ }
StrCopy( aCountryCode, mobilePhoneNetworkInfo.iCountryCode );
StrCopy( aNetworkID, mobilePhoneNetworkInfo.iNetworkId );