--- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp	Tue Jun 15 14:14:38 2010 +0100
+++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkplugin.cpp	Thu Jul 22 16:33:21 2010 +0100
@@ -24,14 +24,16 @@
   CpNetworkPlugin::CpNetworkPlugin
  */
 CpNetworkPlugin::CpNetworkPlugin() : 
-    QObject(0),
-    m_localisation(0)
+    QObject(NULL),
+    m_localisation(NULL),
+    m_networkStatus(NULL)
 {
     INSTALL_TRACE_MSG_HANDLER;
     DPRINT << ": IN";
     
-    // Set scoped pointer 
+    // Create guarded objects
     m_localisation.reset(new CpPhoneLocalisation); 
+    m_networkStatus.reset(new CpNetworkStatus); 
     
     // Install required translations
     m_localisation->installTranslator(
@@ -57,16 +59,40 @@
  */
 QList<CpSettingFormItemData*> CpNetworkPlugin::createSettingFormItemData(
         CpItemDataHelper &itemDataHelper) const
-{
-    DPRINT;
-
+{   
+    DPRINT << ": IN";
     QList<CpSettingFormItemData*> ret;
     ret.append(new CpSettingFormEntryItemDataImpl<CpNetworkPluginView>(
             itemDataHelper,
             hbTrId("txt_cp_dblist_mobile_network"),
-            hbTrId("")));
+            m_networkStatus->statusText(),
+            m_networkStatus->statusIcon()));
+    
+    m_networkStatus->setSettingFormItemData(ret.first());
+        
+    DPRINT << ": OUT";
     return ret;
 }
 
+/*!
+  CpNetworkPlugin::createSettingView
+ */
+CpBaseSettingView *CpNetworkPlugin::createSettingView(const QVariant &hint) const 
+    {
+    Q_UNUSED(hint)
+    DPRINT << ": IN";
+    
+    CpItemDataHelper *itemDataHelper(NULL);
+    QScopedPointer<CpSettingFormEntryItemDataImpl<CpNetworkPluginView> > 
+        data( new CpSettingFormEntryItemDataImpl<CpNetworkPluginView>(
+                    *itemDataHelper,
+                    hbTrId("txt_cp_dblist_mobile_network"),
+                    m_networkStatus->statusText()));
+    CpBaseSettingView *view = data->createSettingView();
+    
+    DPRINT << ": OUT";
+    return view;
+    }
+    
+Q_EXPORT_PLUGIN2(CpNetworkPlugin, CpNetworkPlugin);
 
-Q_EXPORT_PLUGIN2(CpNetworkPlugin, CpNetworkPlugin);