--- a/wlanutilities/wlanindicatorplugin/src/wlanindicatorplugin.cpp	Fri Jun 11 16:27:29 2010 +0100
+++ b/wlanutilities/wlanindicatorplugin/src/wlanindicatorplugin.cpp	Thu Jul 22 16:44:32 2010 +0100
@@ -15,7 +15,7 @@
  * 
  */
 
-#include <QTranslator>
+#include <HbTranslator>
 #include <QLocale>
 #include <QtCore/qplugin.h>
 #include <QtCore/QString>
@@ -96,11 +96,7 @@
     Q_UNUSED(indicatorType)
     
     // Install localization
-    QTranslator *translator = new QTranslator(this);
-    QString lang = QLocale::system().name(); 
-    QString path = "Z:/resource/qt/translations/"; 
-    translator->load("wlanindicatorplugin_" + lang, path);
-    qApp->installTranslator(translator);
+    HbTranslator *translator(new HbTranslator("wlanindicatorplugin"));
     
     OstTraceFunctionExit1(WLANINDICATORPLUGIN_CREATEINDICATOR_EXIT, this);
     return this;
@@ -125,14 +121,11 @@
     OstTraceFunctionEntry1(WLANINDICATORPLUGIN_HANDLEINTERACTION_ENTRY, this);
 
     bool handled = false;
+    QVariantMap data;
     switch (type) {
     case InteractionActivated: 
-        //connect error() to slot processError() to get error, 
-        QObject::connect( &process, SIGNAL(error(QProcess::ProcessError)),                       
-                          this, SLOT(processError(QProcess::ProcessError)));
-
-        // Show WLAN list view
-        process.start("WlanSniffer");
+        // Emit a signal that will inform the client to start the wlan list view 
+        emit userActivated(data);
         handled = true;
         break;
     default:
@@ -197,9 +190,7 @@
                     }
 
             else if (indicatorText[0] == wlanConnected){
-                QString iapName = indicatorText[1].toString();                                        
-                QString str = QString(hbTrId("txt_occ_dblist_wireless_lan_val_1_connected"));
-                qvariant = str.arg(iapName);
+                qvariant = indicatorText[1].toString();
                 }
             }            
         else 
@@ -214,14 +205,14 @@
         if (mParameter.isValid() && mParameter.type() == QVariant::List) {
             indicatorText = mParameter.toList();
             if ((indicatorText.size() > 0) && (indicatorText[0] == wlanConnected)) {
-                qvariant = HbIcon("qtg_status_wlan");
+                qvariant = QString("qtg_status_wlan");
             }
         }
         break;
         // this is the icon in the indicator
     case DecorationNameRole:
         OstTraceFunctionExit1(DUP2_WLANINDICATORPLUGIN_INDICATORDATA_EXIT, this);
-        qvariant = HbIcon("qtg_small_wlan");
+        qvariant = QString("qtg_small_wlan");
         break;
     default:
         OstTraceFunctionExit1(DUP3_WLANINDICATORPLUGIN_INDICATORDATA_EXIT, this);
@@ -230,25 +221,3 @@
     return qvariant;
 }
 
-/*!
-    The processError is a handler for error codes.
-*/
-void WlanIndicatorPlugin::processError(QProcess::ProcessError err)
-    {
-    OstTraceFunctionEntry1(WLANINDICATORPLUGIN_PROCESSERROR_ENTRY, this);
-  
-    switch (err) {   
-        case QProcess::FailedToStart: 
-        case QProcess::Crashed: 
-        case QProcess::Timedout: 
-        case QProcess::ReadError: 
-        case QProcess::WriteError: 
-        case QProcess::UnknownError:
-            OstTrace1( WLANINDICATORPLUGIN_ERR,PROCESSERROR_KNOWN,"Process Error %u", err);
-            break;  
-        default:
-        OstTrace1( WLANINDICATORPLUGIN_ERR,PROCESSERROR_UNKNOWN,"Unknown Process Error %u", err);
-            break;
-        }
-    OstTraceFunctionExit1(WLANINDICATORPLUGIN_PROCESSERROR_EXIT, this);
-    }