diff -r 0e4955de0cea -r e32446434994 connectivitymodules/SeCon/services/csc/src/caputils.cpp --- a/connectivitymodules/SeCon/services/csc/src/caputils.cpp Thu Jun 17 12:15:44 2010 +0100 +++ b/connectivitymodules/SeCon/services/csc/src/caputils.cpp Thu Jul 22 16:30:46 2010 +0100 @@ -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 );