diff -r 90517678cc4f -r 453da2cfceef qtmobility/src/systeminfo/symbian/telephonyinfo_s60.cpp
--- a/qtmobility/src/systeminfo/symbian/telephonyinfo_s60.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/src/systeminfo/symbian/telephonyinfo_s60.cpp	Fri May 14 16:41:33 2010 +0300
@@ -134,29 +134,6 @@
     return m_imsi;
 }
 
-/*
-CIndicatorInfo::CIndicatorInfo(CTelephony &telephony) : CTelephonyInfo(telephony),
-    m_batteryInfoV1Pckg(m_batteryInfoV1)
-{
-}
-
-void CIndicatorInfo::DoCancel()
-{
-    m_telephony.CancelAsync(CTelephony::EGetIndicatorCancel);
-}
-
-bool CIndicatorInfo::isBatteryCharging() const
-{
-    m_telephony.GetIndicator(iStatus,iIndicatorV1Pckg);
-    makeRequest();
-
-    if (iIndicatorV1.iIndicator & CTelephony::KIndChargerConnected) {
-        chargeStatus = true;
-    }
-    return chargeStatus;
-}
-*/
-
 CBatteryInfo::CBatteryInfo(CTelephony &telephony) : CTelephonyInfo(telephony),
     m_initializing(true), m_batteryInfoV1Pckg(m_batteryInfoV1)
 {
@@ -166,9 +143,6 @@
     m_batteryLevel = m_batteryInfoV1.iChargeLevel;
     m_previousBatteryLevel = m_batteryLevel;
 
-    m_powerState = m_batteryInfoV1.iStatus;
-    m_previousPowerState = m_powerState;
-    
     m_initializing = false;
 
     startMonitoring();
@@ -180,18 +154,13 @@
         CTelephonyInfo::RunL();
     } else {
         m_batteryLevel = m_batteryInfoV1.iChargeLevel;
-        m_powerState = m_batteryInfoV1.iStatus;
 
         foreach (MTelephonyInfoObserver *observer, m_observers) {
             if (m_batteryLevel != m_previousBatteryLevel) {
                 observer->batteryLevelChanged();
             }
-            if (m_powerState != m_previousPowerState) {
-                observer->powerStateChanged();
-            }
         }
         m_previousBatteryLevel = m_batteryLevel;
-        m_previousPowerState = m_powerState;
         startMonitoring();
     }
 }
@@ -210,11 +179,6 @@
     return m_batteryLevel;
 }
 
-CTelephony::TBatteryStatus CBatteryInfo::powerState() const
-{
-    return m_powerState;
-}
-
 void CBatteryInfo::startMonitoring()
 {
     m_telephony.NotifyChange(iStatus, CTelephony::EBatteryInfoChange, m_batteryInfoV1Pckg);
@@ -237,9 +201,13 @@
     TBuf<CTelephony::KNetworkCountryCodeSize> countryCode = m_networkInfoV1.iCountryCode;
     m_countryCode = QString::fromUtf16(countryCode.Ptr(), countryCode.Length());
     m_previousCountryCode = m_countryCode;
-
-    TBuf<CTelephony::KNetworkLongNameSize> networkName = m_networkInfoV1.iLongName;
-    m_networkName = QString::fromUtf16(networkName.Ptr(), networkName.Length());
+    TBuf<CTelephony::KNetworkLongNameSize> longName = m_networkInfoV1.iLongName;
+    if (longName.Length() > 0) {
+        m_networkName = QString::fromUtf16(longName.Ptr(), longName.Length());
+    } else {
+        TBuf<CTelephony::KNetworkDisplayTagSize> displayTag = m_networkInfoV1.iDisplayTag;
+        m_networkName = QString::fromUtf16(displayTag.Ptr(), displayTag.Length());
+    }
     m_previousNetworkName = m_networkName;
 
     m_networkMode = m_networkInfoV1.iMode;
@@ -264,9 +232,13 @@
         TBuf<CTelephony::KNetworkCountryCodeSize> countryCode = m_networkInfoV1.iCountryCode;
             m_countryCode = QString::fromUtf16(countryCode.Ptr(), countryCode.Length());
 
-        TBuf<CTelephony::KNetworkLongNameSize> networkName = m_networkInfoV1.iLongName;
-            m_networkName = QString::fromUtf16(networkName.Ptr(),
-            networkName.Length());
+        TBuf<CTelephony::KNetworkLongNameSize> longName = m_networkInfoV1.iLongName;
+        if (longName.Length() > 0) {
+            m_networkName = QString::fromUtf16(longName.Ptr(), longName.Length());
+        } else {
+            TBuf<CTelephony::KNetworkDisplayTagSize> displayTag = m_networkInfoV1.iDisplayTag;
+            m_networkName = QString::fromUtf16(displayTag.Ptr(), displayTag.Length());
+        }
 
         m_networkMode = m_networkInfoV1.iMode;