# HG changeset patch
# User hgs
# Date 1288217910 -19800
# Node ID a6c938002837b28bc3f30e0899ee6eed9aefb115
# Parent  fdbfe0a95492d85b1d68a8761536bf2fc30e1c62
201043

diff -r fdbfe0a95492 -r a6c938002837 applicationmanagement/doc/S60_3_1_TARM_Application_Management_Design_C.doc
Binary file applicationmanagement/doc/S60_3_1_TARM_Application_Management_Design_C.doc has changed
diff -r fdbfe0a95492 -r a6c938002837 clientprovisioning/cpqtsp/inc/CWPBioControl.h
--- a/clientprovisioning/cpqtsp/inc/CWPBioControl.h	Fri Oct 15 11:39:02 2010 +0530
+++ b/clientprovisioning/cpqtsp/inc/CWPBioControl.h	Thu Oct 28 03:48:30 2010 +0530
@@ -130,6 +130,7 @@
         TInt iCompletionCode;
         CpMessage* iMsg;
         CpQtSp* iSp;
+        TBool iPreAuthenticated;
     };
 
 
diff -r fdbfe0a95492 -r a6c938002837 clientprovisioning/cpqtsp/src/CWPBioControl.cpp
--- a/clientprovisioning/cpqtsp/src/CWPBioControl.cpp	Fri Oct 15 11:39:02 2010 +0530
+++ b/clientprovisioning/cpqtsp/src/CWPBioControl.cpp	Thu Oct 28 03:48:30 2010 +0530
@@ -74,6 +74,7 @@
     ibootstrap = NULL;
     iMsg = new(ELeave)CpMessage(this);
     iWait = new( ELeave ) CActiveSchedulerWait;
+    iPreAuthenticated = EFalse;
     FLOG( _L( "[ProvisioningBC] CWPBioControl::ConstructL: done" ) );
     }
 
@@ -134,7 +135,10 @@
         //result = KErrMsgBioMessageNotValid;
         }
     FTRACE(RDebug::Print(_L("[ProvisioningBC] CWPBioControl::RestoreMsgL result (%d)"), result));
-    User::LeaveIfError( result );    
+    User::LeaveIfError( result );
+    
+    // Get the value of the authentication before authenticating the message
+    iPreAuthenticated = iMessage->Authenticated();
 	AuthenticateL( *iMessage );
 	CleanupStack::PopAndDestroy();
 	if(iAuth == KAUTENTICATIONCANCEL || iAuth == KAUTENTICATIONSUCCESS)
@@ -191,8 +195,8 @@
            User::LeaveIfError(err);
            }
 
-    TBool preAuthenticated( iMessage->Authenticated() );
-    if( !iEntry.ReadOnly() && preAuthenticated != iMessage->Authenticated() )
+    
+    if( !iEntry.ReadOnly() && iPreAuthenticated != iMessage->Authenticated() )
         {
         // If the entry can be written to, get its edit store and save
         // authentication flag. Failing is not dangerous, as the only
diff -r fdbfe0a95492 -r a6c938002837 deviceupdatesui/deviceupdates/src/dmfotaview.cpp
--- a/deviceupdatesui/deviceupdates/src/dmfotaview.cpp	Fri Oct 15 11:39:02 2010 +0530
+++ b/deviceupdatesui/deviceupdates/src/dmfotaview.cpp	Thu Oct 28 03:48:30 2010 +0530
@@ -26,6 +26,7 @@
 #include <etelmm.h>
 #include <hbnotificationdialog.h>
 #include <centralrepository.h>
+#include <hbparameterlengthlimiter.h>
 #include <sysversioninfo.h>
 #include "nsmldmsyncprivatecrkeys.h"
 #include "dmadvancedview.h"
@@ -298,14 +299,12 @@
         TInt sizeKB = Size / 1024;
         if(sizeKB < 1024)
             {
-            val = hbTrId("txt_device_update_setlabel_the_last_update_1_2_kb").arg(name)
-                    .arg(ver).arg(sizeKB);
+            val=HbParameterLengthLimiter("txt_device_update_setlabel_the_last_update_1_2_kb").arg(name).arg(ver).arg(sizeKB);
             }
         else
             {
             TInt sizeMB = sizeKB / 1024;
-            val = hbTrId("txt_device_update_setlabel_the_last_update_1_2_mb").arg(name)
-                    .arg(ver).arg(sizeMB);
+            val=HbParameterLengthLimiter("txt_device_update_setlabel_the_last_update_1_2_mb").arg(name).arg(ver).arg(sizeMB);
             }
         mLabel->setPlainText(val);
         mLabel2->setPlainText(val);
@@ -658,14 +657,12 @@
         	TInt sizeKB = Size / 1024;
 	        if(sizeKB < 1024)
 	            {
-	            val = hbTrId("txt_device_update_setlabel_the_last_update_1_2_kb").arg(name)
-	                    .arg(ver).arg(sizeKB);
+	            val=HbParameterLengthLimiter("txt_device_update_setlabel_the_last_update_1_2_kb").arg(name).arg(ver).arg(sizeKB);
 	            }
 	        else
 	            {
 	            TInt sizeMB = sizeKB / 1024;
-	            val = hbTrId("txt_device_update_setlabel_the_last_update_1_2_mb").arg(name)
-        	            .arg(ver).arg(sizeMB);
+	            val=HbParameterLengthLimiter("txt_device_update_setlabel_the_last_update_1_2_mb").arg(name).arg(ver).arg(sizeMB);
 	            }
 	        
 	        mLabel->setPlainText(val);
diff -r fdbfe0a95492 -r a6c938002837 omacpadapters/cpdestinationnwadapter/doc/S60_OMA_Client_Provisioning_Destination_Network_Adapter_Design_C.doc
Binary file omacpadapters/cpdestinationnwadapter/doc/S60_OMA_Client_Provisioning_Destination_Network_Adapter_Design_C.doc has changed