connectivitymodules/SeCon/services/csc/src/caputils.cpp
changeset 36 9ba7f05d28a5
parent 19 2691f6aa1921
--- a/connectivitymodules/SeCon/services/csc/src/caputils.cpp	Wed Jun 23 18:02:53 2010 +0300
+++ b/connectivitymodules/SeCon/services/csc/src/caputils.cpp	Tue Jul 06 14:06:02 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 );