# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282113571 -10800
# Node ID 1273bf2c520ce806ab767d05b0c7b8c2f905465e
# Parent  aa33c2cb9a503bd933ba1172b2285b138fd19d34
Revision: 201031
Kit: 201033

diff -r aa33c2cb9a50 -r 1273bf2c520c applicationmanagement/server/inc/ApplicationManagementServer.h
--- a/applicationmanagement/server/inc/ApplicationManagementServer.h	Tue Jul 06 14:06:19 2010 +0300
+++ b/applicationmanagement/server/inc/ApplicationManagementServer.h	Wed Aug 18 09:39:31 2010 +0300
@@ -28,7 +28,7 @@
 #include <swi/sisregistrysession.h>
 #include <swi/sisregistrypackage.h>
 #include <swi/sisregistryentry.h>
-#include <HbProgressDialog.h>
+#include <hbprogressdialog.h>
 #include <hbmainwindow.h>
 #include <hbaction.h>
 #include <usif/sif/sif.h>
diff -r aa33c2cb9a50 -r 1273bf2c520c applicationmanagement/server/inc/appmgmtdownloadmgr.h
--- a/applicationmanagement/server/inc/appmgmtdownloadmgr.h	Tue Jul 06 14:06:19 2010 +0300
+++ b/applicationmanagement/server/inc/appmgmtdownloadmgr.h	Wed Aug 18 09:39:31 2010 +0300
@@ -76,7 +76,7 @@
         appmgmtdownloadmgr(QWidget* parent, MDownloadMgrQTCallback& wrapper, TRequestStatus& aStatus);
         ~appmgmtdownloadmgr();
         
-        void startDownload(CDeploymentComponent *aComponent);
+        void startDownload(CDeploymentComponent *aComponent, int aIapid);
         void showDialog(CDeploymentComponent *aComponent);
         void showUninstallDialog(const CDeploymentComponent &aCompo, TRequestStatus &s);
         void updateProgress(TInt32 aDownloadedSize, TInt32 aContentSize);
@@ -91,6 +91,7 @@
         void sendSrvToBg();
         QString convertSize();
         int currDwnldStatForGenericAlert(int dwnldstatus);
+        QString GetIapNameWithIdL(TInt aIapId);
         
     public slots:
         bool downloadMgrEventRecieved(DownloadManagerEvent *event);
diff -r aa33c2cb9a50 -r 1273bf2c520c applicationmanagement/server/server.pro
--- a/applicationmanagement/server/server.pro	Tue Jul 06 14:06:19 2010 +0300
+++ b/applicationmanagement/server/server.pro	Wed Aug 18 09:39:31 2010 +0300
@@ -70,7 +70,8 @@
         -lapgrfx \
         -lws32 \
         -lapmime \ 
-        -lsif
+        -lsif \
+        -lcmmanager
 }
 TEMPLATE = app
 TARGET = applicationmanagementserver
@@ -123,10 +124,10 @@
     ./src/amwaitprogdialog.cpp \
     ./src/AMAppHideUtil.cpp \
     ./src/AMDeploymentComponent.cpp \
-    ./src/amdeploymentcomponentdata.cpp \ 
+    ./src/AMDeploymentComponentData.cpp \ 
     ./src/AMDownloaddb.cpp \ 
     ./src/AMPreInstallApp.cpp \
-    ./src/amsmlhelper.cpp \
+    ./src/AMSmlHelper.cpp \
     ./src/amstorage.cpp \
     ./src/ApplicationManagementJavaUtility.cpp \
     ./src/ApplicationManagementServer.cpp \
diff -r aa33c2cb9a50 -r 1273bf2c520c applicationmanagement/server/src/AMDeploymentComponent.cpp
--- a/applicationmanagement/server/src/AMDeploymentComponent.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/applicationmanagement/server/src/AMDeploymentComponent.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -19,9 +19,9 @@
 #include <s32mem.h>
 #include <featmgr.h>
 #include <ssl.h>
-#include <APGCLI.H>
-#include <APMREC.h>
-#include <APMSTD.H>
+#include <apgcli.h>
+#include <apmrec.h>
+#include <apmstd.h>
 #ifdef __SERIES60_30__
 #include <CMenuClient.h>
 #endif
diff -r aa33c2cb9a50 -r 1273bf2c520c applicationmanagement/server/src/AMDownloadStore.cpp
--- a/applicationmanagement/server/src/AMDownloadStore.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/applicationmanagement/server/src/AMDownloadStore.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -143,7 +143,7 @@
 
     aComponent->SetCallback(this);
     appdwnld = new appmgmtdownloadmgr(0, *this, aStatus);
-    appdwnld->startDownload(aComponent);
+    appdwnld->startDownload(aComponent, iap);
 
     RDEBUG( "CAMDwnldQTWrap::StartDownload End" );
 
diff -r aa33c2cb9a50 -r 1273bf2c520c applicationmanagement/server/src/ApplicationManagementServer.cpp
--- a/applicationmanagement/server/src/ApplicationManagementServer.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/applicationmanagement/server/src/ApplicationManagementServer.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -24,7 +24,7 @@
 #include <imcvcodc.h>
 #include <uikon.hrh>
 #include <e32property.h>
-#include <DriveInfo.h>
+#include <driveinfo.h>
 #include <SWInstDefs.h>
 #include <PolicyEngineClient.h>
 #include <PolicyEngineXACML.h>
diff -r aa33c2cb9a50 -r 1273bf2c520c applicationmanagement/server/src/appmgmtdownloadmgr.cpp
--- a/applicationmanagement/server/src/appmgmtdownloadmgr.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/applicationmanagement/server/src/appmgmtdownloadmgr.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -18,11 +18,10 @@
 #include <nsmldmconst.h>
 #include <downloadmanager.h>
 #include <download.h>
-#include <e32Property.h>
 #include <serviceipc.h>
 #include <hbdialog.h>
 #include <hblabel.h>
-#include <HbMessageBox.h>
+#include <hbmessagebox.h>
 #include <hbapplication.h>
 #include <hbdevicenotificationdialog.h>
 #include <hbaction.h>
@@ -30,7 +29,7 @@
 #include <coemain.h>
 #include <e32base.h>
 #include <eikenv.h>
-#include <Driveinfo.h>
+#include <driveinfo.h>
 #include <e32property.h>
 #include "ApplicationManagementUtility.h"
 #include "debug.h"
@@ -39,6 +38,9 @@
 #include "appmgmtnotifier.h"
 #include "appmgmtdownloadmgr.h"
 #include "ServicePluginLogger.h"
+
+#include <cmmanager.h>
+#include <cmconnectionmethod.h>
 using namespace NApplicationManagement;
 
 // ------------------------------------------------------------------------------------------------
@@ -84,7 +86,7 @@
 // ------------------------------------------------------------------------------------------------
 // appmgmtdownloadmgr::startDownload
 // ------------------------------------------------------------------------------------------------ 
-void appmgmtdownloadmgr::startDownload(CDeploymentComponent *aComponent)
+void appmgmtdownloadmgr::startDownload(CDeploymentComponent *aComponent, int aIapid)
     {
 
     RDEBUG( "appmgmtdownloadmgr::startDownload Start" );
@@ -116,6 +118,10 @@
     RProperty::Get(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,silentsession);
     
     CApplicationManagementUtility::iSilentSession = silentsession;
+    
+    QString name = GetIapNameWithIdL(aIapid);
+    
+    int ret = iDownloadManager->setAttribute(AccessPoint, name);
 
     iDl = iDownloadManager->createDownload(url, m_type);
 
@@ -825,7 +831,30 @@
     }
 }
 
+// --------------------------------------------------------------------------
+//  Gets the access point name for a given access point id.
+// --------------------------------------------------------------------------
+QString appmgmtdownloadmgr::GetIapNameWithIdL(TInt aIapId)
+    {
+    QString name(NULL);
 
+    RCmManager cmManager;
+    cmManager.OpenL();
+
+    RCmConnectionMethod conn;
+    conn = cmManager.ConnectionMethodL(aIapId);
+
+    HBufC* temp = conn.GetStringAttributeL(CMManager::ECmName);
+    name = QString::fromUtf16(temp->Ptr(), temp->Length());
+    delete temp;
+    temp = NULL;
+
+    conn.Close();
+
+    cmManager.Close();
+
+    return name;
+    }
 
 //---------------------------------------------------------------------------------
 // CDialogWait::CDialogWait
diff -r aa33c2cb9a50 -r 1273bf2c520c applicationmanagement/server/src/appmgmtnotifier.cpp
--- a/applicationmanagement/server/src/appmgmtnotifier.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/applicationmanagement/server/src/appmgmtnotifier.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -16,17 +16,18 @@
  */
 
 
-#include <HbDeviceDialog.h>
+#include <hbdevicedialog.h>
 #include <apgtask.h>
 #include <eikenv.h>
-#include <Driveinfo.h>
+#include <driveinfo.h>
+#include <hbapplication.h>
+#include <hbmessagebox.h>
 #include "amstorage.h"
 #include "appmgmtnotifier.h"
 #include "appmgmtdownloadmgr.h"
-#include "applicationmanagementutility.h"
+#include "ApplicationManagementUtility.h"
 #include "debug.h"
-#include <hbapplication.h>
-#include <hbmessagebox.h>
+
 // ------------------------------------------------------------------------------------------------
 // AppMgmtNotifier::AppMgmtNotifier
 // ------------------------------------------------------------------------------------------------ 
diff -r aa33c2cb9a50 -r 1273bf2c520c clientprovisioning/cpqtsp/inc/CWPBioControl.h
--- a/clientprovisioning/cpqtsp/inc/CWPBioControl.h	Tue Jul 06 14:06:19 2010 +0300
+++ b/clientprovisioning/cpqtsp/inc/CWPBioControl.h	Wed Aug 18 09:39:31 2010 +0300
@@ -22,14 +22,14 @@
 
 // INCLUDES
 #include <e32cmn.h>
-#include <MSVAPI.H>
+#include <CWPNameValue.h>
 #include <hbsymbianvariant.h>
 #include <hbdevicedialogsymbian.h>
 #include <CWPBootstrap.h>
+#include "ProvisioningUIDs.h"
+#include "CpMessage.h"
 #include "CWPSaver.h"
-#include <ProvisioningUIDs.h>
-#include <CpMessage.h>
-#include <CpQtSpView.h>
+#include "CpQtSpView.h"
 
 class CWPEngine;
 class CWPNameValue;
diff -r aa33c2cb9a50 -r 1273bf2c520c clientprovisioning/cpqtsp/inc/CpQtSpView.h
--- a/clientprovisioning/cpqtsp/inc/CpQtSpView.h	Tue Jul 06 14:06:19 2010 +0300
+++ b/clientprovisioning/cpqtsp/inc/CpQtSpView.h	Wed Aug 18 09:39:31 2010 +0300
@@ -23,7 +23,7 @@
 #include <xqserviceprovider.h>
 #include <QGraphicsLinearLayout>
 #include <CWPNameValue.h>
-#include <MSVAPI.H>
+#include <msvapi.h>
 #include <hbscrollarea.h>
 #include <CpQtSpMainWindow.h>
 #include <HbGroupBox>
diff -r aa33c2cb9a50 -r 1273bf2c520c clientprovisioning/cpqtsp/src/CWPBioControl.cpp
--- a/clientprovisioning/cpqtsp/src/CWPBioControl.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/clientprovisioning/cpqtsp/src/CWPBioControl.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -40,7 +40,7 @@
 #include <hbdevicedialog.h>
 #include <QObject>
 #include <devicedialogconsts.h>
-#include <PnpUtilLogger.h>
+#include "PnpUtilLogger.h"
 
 // CONSTANTS
 _LIT(KNone,"");
diff -r aa33c2cb9a50 -r 1273bf2c520c clientprovisioning/cpqtsp/src/CpQtSpView.cpp
--- a/clientprovisioning/cpqtsp/src/CpQtSpView.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/clientprovisioning/cpqtsp/src/CpQtSpView.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -19,7 +19,7 @@
 #include <hbapplication.h>
 #include <hbtoolbar.h>
 #include <hbaction.h>
-#include <HbMenu.h>
+#include <hbmenu.h>
 #include <HbTextItem>
 #include <HbFontSpec>
 #include <HbMessageBox>
@@ -29,22 +29,22 @@
 #include <xqserviceutil.h>
 #include <e32base.h>
 #include <flogger.h>
-#include <CWPNameValue.h>
 #include <CWPEngine.h>
-#include <CpQtSpView.h>
-#include <CpQtSpMainWindow.h>
 #include <HbGroupBox>
 #include <HbListWidget>
 #include <HbListWidgetItem>
 #include <HbLabel>
-#include <MSVSTD.H>
-#include <SMSCLNT.H>
-#include <MTCLREG.H>
-#include <SMUTHDR.H>
+#include <msvstd.h>
+#include <smsclnt.h>
+#include <mtclreg.h>
+#include <smuthdr.h>
 #include <QDateTime>
+#include "CWPNameValue.h"
+#include "CpQtSpView.h"
+#include "CpQtSpMainWindow.h"
 #include "ProvisioningDebug.h"
 #include "ProvisioningUIDs.h"
-#include <CWPBioControl.h>
+#include "CWPBioControl.h"
 const QString DATE_TIME_FORMAT("dd.MM.yy hh:mm");
 
 // ----------------------------------------------------------------------------
diff -r aa33c2cb9a50 -r 1273bf2c520c devicemgmtdialogsplugin/src/devicemanagementnotifierutils.cpp
--- a/devicemgmtdialogsplugin/src/devicemanagementnotifierutils.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/devicemgmtdialogsplugin/src/devicemanagementnotifierutils.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -23,7 +23,7 @@
 #include <hbaction.h>
 #include <e32property.h>
 #include <qdebug.h>
-#include "SyncMLNotifierParams.h"
+#include <devicedialogsymbian.h>
 #include "pnputillogger.h"
 #include "omacppinquerydialog.h"
 #include "devicemanagementnotifierwidget_p.h"
diff -r aa33c2cb9a50 -r 1273bf2c520c devicemgmtdialogsplugin/src/fotadevicedialogs.cpp
--- a/devicemgmtdialogsplugin/src/fotadevicedialogs.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/devicemgmtdialogsplugin/src/fotadevicedialogs.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -15,21 +15,22 @@
 *
 */
 
-#include "devicemanagementnotifierutils.h"
+
 #include <hbdocumentloader.h>
 #include <hbdialog.h>
 #include <hblabel.h>
 #include <hbmessagebox.h>
-#include <HbAction.h>
-#include <e32Property.h>
-#include "syncmlnotifierparams.h"
-#include "fotadevicedialogs.h"
-#include "PnpUtilLogger.h"
-#include <QDebug.h>
-#include <HbListView.h>
+#include <hbaction.h>
+#include <e32property.h>
+#include <qdebug.h>
+#include <hblistview.h>
 #include <hbpushbutton.h>
 #include <e32math.h>
 #include <QStandardItemModel>
+#include <devicedialogsymbian.h>
+#include "devicemanagementnotifierutils.h"
+#include "fotadevicedialogs.h"
+#include "pnputillogger.h"
 
 
 // ---------------------------------------------------------------------------
diff -r aa33c2cb9a50 -r 1273bf2c520c devicemgmtdialogsplugin/src/omacppinquerydialog.cpp
--- a/devicemgmtdialogsplugin/src/omacppinquerydialog.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/devicemgmtdialogsplugin/src/omacppinquerydialog.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -15,11 +15,11 @@
  *
  */
 
-#include <e32Property.h>
+#include <e32property.h>
 #include <qdebug.h>
 #include <qtranslator.h>
 #include <qcoreapplication.h>
-#include <HbAction.h>
+#include <hbaction.h>
 #include <devicedialogconsts.h>
 #include "omacppinquerydialog.h"
 #include "pnputillogger.h"
diff -r aa33c2cb9a50 -r 1273bf2c520c devicemgmtdialogsplugin/src/syncmlnotifierprivate.cpp
--- a/devicemgmtdialogsplugin/src/syncmlnotifierprivate.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/devicemgmtdialogsplugin/src/syncmlnotifierprivate.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -17,14 +17,14 @@
 
 
 #include <e32property.h>
-#include "syncmlnotifierprivate.h"
 #include <SyncMLClientDM.h>
 #include <SyncMLClient.h>
 #include <centralrepository.h>
 #include <DevManInternalCRKeys.h>
+#include <centralrepository.h>
+#include <devicedialogsymbian.h>
+#include "syncmlnotifierprivate.h"
 #include "nsmlconstantdefs.h"
-#include "syncmlnotifierparams.h"
-#include <centralrepository.h>
 
 
 
diff -r aa33c2cb9a50 -r 1273bf2c520c devicemgmtindicatorsplugin/src/dmindicatorsplugin.cpp
--- a/devicemgmtindicatorsplugin/src/dmindicatorsplugin.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/devicemgmtindicatorsplugin/src/dmindicatorsplugin.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -106,7 +106,7 @@
         qDebug("DMIndicatorsPlugin::accessAllowed() SecUID is not secure ");
         return false;
         }
-#elif
+#else
     Q_UNUSED(securityInfo)
     qDebug("DMIndicatorsPlugin::accessAllowed() not Symbian ");
     return false;
diff -r aa33c2cb9a50 -r 1273bf2c520c devicemgmtindicatorsplugin/src/dmpronoteindicators.cpp
--- a/devicemgmtindicatorsplugin/src/dmpronoteindicators.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/devicemgmtindicatorsplugin/src/dmpronoteindicators.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -14,17 +14,18 @@
  * Description: DM Progress and Notification indicators implementation
  *
  */
-#include "dmindicator.h" 
-#include "dmpronoteindicators.h" 
+
 #include <QByteArray>
 #include <QVariant>
 #include <e32base.h>
 #include <w32std.h>
 #include <apgtask.h>
 #include <apgtask.h>
-#include <HbIndicator.h>
+#include <hbindicator.h>
+#include <eikenv.h>
+#include "dmindicator.h" 
+#include "dmpronoteindicators.h" 
 
-#include <eikenv.h>
 // ----------------------------------------------------------------------------
 // DMProNoteIndicator::DMProNoteIndicator
 // @see dmpronoteindicators.h
diff -r aa33c2cb9a50 -r 1273bf2c520c deviceupdatesui/deviceupdates/inc/dmfotaview.h
--- a/deviceupdatesui/deviceupdates/inc/dmfotaview.h	Tue Jul 06 14:06:19 2010 +0300
+++ b/deviceupdatesui/deviceupdates/inc/dmfotaview.h	Wed Aug 18 09:39:31 2010 +0300
@@ -24,7 +24,7 @@
 #include <QGraphicsLinearLayout>
 #include <hbgroupbox.h>
 #include <hbview.h>
-#include <SysUtil.h>
+#include <sysutil.h>
 #include <hblabel.h>
 #include <hbdocumentloader.h>
 #include <hbmenu.h>
@@ -35,8 +35,8 @@
 #include <centralrepository.h>
 #include <QTranslator>
 #include <nsmldmdef.h>
+#include <fotaengine.h>
 #include "dminforetrieval.h"
-#include <fotaengine.h>
 #include "deviceupdatemoniterobserver.h"
 //_LIT( KSmlEOL,      "\n" );
 
diff -r aa33c2cb9a50 -r 1273bf2c520c deviceupdatesui/deviceupdates/inc/dminforetrieval.h
--- a/deviceupdatesui/deviceupdates/inc/dminforetrieval.h	Tue Jul 06 14:06:19 2010 +0300
+++ b/deviceupdatesui/deviceupdates/inc/dminforetrieval.h	Wed Aug 18 09:39:31 2010 +0300
@@ -44,8 +44,9 @@
        int profilescount();
       int profileinfo(int profilelistnum, QStringList& itemtext, int& icon, bool& lock);       
        void setDefaultProfile(int listitem);      
-       bool Isprofilelocked(int profilelistnum/*, bool& lock*/);
-       bool Isdefaultprofile(int profilelistnum/*, bool& defaultprofile*/);
+       bool Isprofilelocked(int profilelistnum);
+       bool Isdefaultprofile(int profilelistnum);
+       bool isProfileDeleteAllowed(int profilelistnum);
        void profileTransport(int profilelistnum, int& transport);
        TInt DeleteProfile( TInt& aIndex );
        bool createNewprofile();       
diff -r aa33c2cb9a50 -r 1273bf2c520c deviceupdatesui/deviceupdates/src/dmadvancedview.cpp
--- a/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -75,7 +75,8 @@
             connect(defaultprofileAction, SIGNAL(triggered()), this,
                     SLOT(defaultMenuItemSelected()));
             }
-        if (!dminfo->Isprofilelocked(currentselecteditem))
+        if (!dminfo->Isprofilelocked(currentselecteditem) && 
+                     dminfo->isProfileDeleteAllowed(currentselecteditem) )
             {
             deleteaction = csmenu->addAction(hbTrId(
                     "txt_device_update_menu_delete"));
diff -r aa33c2cb9a50 -r 1273bf2c520c deviceupdatesui/deviceupdates/src/dminforetrieval.cpp
--- a/deviceupdatesui/deviceupdates/src/dminforetrieval.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/dminforetrieval.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -247,6 +247,19 @@
     return defaultprofile;
     }
 
+bool DmInfo::isProfileDeleteAllowed(int profilelistnum)
+    {
+    bool deleteAllowed = false;
+    if(profilelistnum >= 0 && iProfileList->Count() > 0)
+        {        
+        if(( iProfileList->At( profilelistnum ).iDeleteAllowed))
+            {
+        deleteAllowed = true;
+            }                  
+        }
+    return deleteAllowed;
+    }
+
 void DmInfo::profileTransport(int profilelistnum, int& transport)
     {
     if(profilelistnum >= 0 && profilelistnum < profilescount())
diff -r aa33c2cb9a50 -r 1273bf2c520c deviceupdatesui/deviceupdates/src/serversettingsview.cpp
--- a/deviceupdatesui/deviceupdates/src/serversettingsview.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/serversettingsview.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -74,12 +74,12 @@
         serverpwd->setContentWidgetData(QString("echoMode"),HbLineEdit::Password );
         serverpwd->setContentWidgetData(QString("text"), settingdatalist[2]);                
         QStringList sList;
-        sList <<hbTrId("txt_device_update_button_internet");
-        sList<<hbTrId("txt_device_update_button_bluetooth");        
+        sList <<hbTrId("txt_deviceupdate_setlabel_to_update_your_val_inter");
+        sList<<hbTrId("txt_deviceupdate_setlabel_to_update_your_val_bluet");        
         sessionmode->setContentWidgetData(QString("text"), sList[0]);//Internet selected
         sessionmode->setContentWidgetData(QString("additionalText"), sList[1]);
         
-        apdata.append(hbTrId("txt_device_update_setlabel_access_point_val_defaul"));
+        apdata.append(hbTrId("txt_deviceupdate_setlabel_access_point_val_default"));
         accesspoint->setContentWidgetData(QString("items"), apdata);
         currentiapindex = currentap;
         if(currentap >= 0)
@@ -95,8 +95,8 @@
         userpwd->setContentWidgetData(QString("echoMode"),HbLineEdit::Password );
         userpwd->setContentWidgetData(QString("text"),settingdatalist[5]);                
         QStringList yesnoList;
-        yesnoList <<hbTrId("txt_device_update_button_yes");
-        yesnoList<<hbTrId("txt_device_update_button_no");
+        yesnoList <<hbTrId("txt_deviceupdate_setlabel_network_auth_val_yes");
+        yesnoList<<hbTrId("txt_deviceupdate_setlabel_network_auth_val_no");
         networkauth->setContentWidgetData(QString("text"), yesnoList[0]);
         networkauth->setContentWidgetData(QString("additionalText"), yesnoList[1]);        
         networkusername->setContentWidgetData(QString("text"),settingdatalist[6]);
@@ -144,7 +144,7 @@
     QString netauthdata =
             sessionmode->contentWidgetData(QString("text")).toString();
     bool netauthval = false;
-    if (netauthdata.compare("yes"))
+    if (netauthdata.compare(hbTrId("txt_deviceupdate_setlabel_network_auth_val_yes")))
         netauthval = true;
     //check server name , server id, host addr & usrname        
     if ((itemlist[0].length() > 0) && (itemlist[1].length() > 0)
@@ -258,13 +258,13 @@
         itemname = hbTrId("txt_device_update_formlabel_password");
         userpwd = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname);
         
-        itemname = hbTrId("txt_device_update_setlabel_network_authentication");
+        itemname = hbTrId("txt_device_update_formlabel_network_authentication");
         networkauth = dataformmodel->appendDataFormItem(HbDataFormModelItem::ToggleValueItem, itemname);
         
-        itemname = hbTrId("txt_device_update_formlabel_network_user_name");
+        itemname = hbTrId("txt_device_update_formlabel_network_username");
         networkusername = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname);
         
-        itemname = hbTrId("txt_device_update_formlabel_network_password");
+        itemname = hbTrId("txt_device_update_setlabel_network_password");
         networkpwd = dataformmodel->appendDataFormItem(HbDataFormModelItem::TextItem, itemname);
         }
     }
diff -r aa33c2cb9a50 -r 1273bf2c520c omacpadapters/MbxNbrAdapter/Src/MbxNbrAdapter.cpp
--- a/omacpadapters/MbxNbrAdapter/Src/MbxNbrAdapter.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/omacpadapters/MbxNbrAdapter/Src/MbxNbrAdapter.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -21,7 +21,7 @@
 #include    <CWPCharacteristic.h>
 #include    <CWPParameter.h>
 #include    <wpmbxnbradapterresource.rsg>
-#include    <CVoiceMailBox.h>
+#include    <cvoicemailbox.h>
 #include 		<cvoicemailboxentry.h>
 #include    <commonphoneparser.h>
 #include 	<voicemailboxdomaincrkeys.h>
diff -r aa33c2cb9a50 -r 1273bf2c520c omacpadapters/bld/bld.inf
--- a/omacpadapters/bld/bld.inf	Tue Jul 06 14:06:19 2010 +0300
+++ b/omacpadapters/bld/bld.inf	Wed Aug 18 09:39:31 2010 +0300
@@ -18,8 +18,8 @@
 PRJ_PLATFORMS
 DEFAULT   
 PRJ_EXPORTS
-../Rom/ProvisioningAdapter.iby			CORE_APP_LAYER_IBY_EXPORT_PATH(provisioningAdapter.iby)
-../Rom/ProvisioningAdapterResources.iby		LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(provisioningAdapterresources.iby)
+../rom/ProvisioningAdapter.iby			CORE_APP_LAYER_IBY_EXPORT_PATH(provisioningAdapter.iby)
+../rom/ProvisioningAdapterResources.iby		LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(provisioningAdapterresources.iby)
 
 ../MbxNbrAdapter/loc/MailboxAdapter.loc		MW_LAYER_LOC_EXPORT_PATH(mailboxadapter.loc)
 ../accesspointadapter/loc/WPAPAdapter.loc	MW_LAYER_LOC_EXPORT_PATH(WPAPAdapter.loc)
diff -r aa33c2cb9a50 -r 1273bf2c520c omadcmoadapters/extmemctrl/src/extmemctrldcmoadapter.cpp
--- a/omadcmoadapters/extmemctrl/src/extmemctrldcmoadapter.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/omadcmoadapters/extmemctrl/src/extmemctrldcmoadapter.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -20,7 +20,6 @@
 #include <driveinfo.h>
 #include <barsread.h> 
 #include <barsc2.h>
-#include <f32file.h> 
 #include <data_caging_path_literals.hrh>
 #include <DevManInternalCRKeys.h>
 #include <centralrepository.h>
diff -r aa33c2cb9a50 -r 1273bf2c520c omadmadapters/email/tsrc/src/dmatest.cpp
--- a/omadmadapters/email/tsrc/src/dmatest.cpp	Tue Jul 06 14:06:19 2010 +0300
+++ b/omadmadapters/email/tsrc/src/dmatest.cpp	Wed Aug 18 09:39:31 2010 +0300
@@ -176,7 +176,10 @@
     TRAPD(err, SaveMappingsL() );
     if ( err != KErrNone )
     	{
-    	iLog->Log( _L8( "Failed to save mappings!: %d"), err );
+    		if ( iLog )
+				{
+    			iLog->Log( _L8( "Failed to save mappings!: %d"), err );
+    		}
     	}
     Delete();