--- a/installationservices/swi/inc/swi/sisuihandler.h	Tue May 25 12:50:16 2010 +0300
+++ b/installationservices/swi/inc/swi/sisuihandler.h	Wed Jun 09 09:49:41 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
@@ -38,6 +38,7 @@
 class CWriteStream;
 class CProgressBarValuePublisher;
 
+
 /**
  * RClass which is used to make calls to the UI Support server using
  * the client-server framework. The ExecuteL() method is passed a
@@ -63,12 +64,10 @@
 	 */
 	IMPORT_C void UpdateProgressBarL(const TAppInfo& aAppInfo, TInt aAmount);
 	
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 	/** Sets a reference to the progress bar value publisher object. The ownership is NOT transferred. */
 	IMPORT_C void SetProgressBarValuePublisher(CProgressBarValuePublisher* aPublisher);
 private:
 	CProgressBarValuePublisher* iPublisher; // Owned by the state machine
-#endif
 	};
 
 /**
@@ -820,7 +819,6 @@
 	return iAppVersion;
 	}
 
-#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 	NONSHARABLE_CLASS(CProgressBarValuePublisher) : public CBase
 	/**
 	 * This class is used to publish the percentage value of the installation progress bar.
@@ -835,7 +833,7 @@
 		IMPORT_C void SetFinalProgressBarValue(TInt aValue);
 		
 		/** Updates the value of the progress bar value property by adding the given value to the current value. */
-		IMPORT_C void UpdateProgressBarValueL(TInt aValue);
+		IMPORT_C TInt CalculateProgressBarValue(TInt aValue);
 	
 	private:
 		CProgressBarValuePublisher();
@@ -844,8 +842,9 @@
 	private:
 		TInt iCurrentProgressValue;
 		TInt iFinalProgressValue;
+		TInt iLastPercentCompletion;
+		TInt iLastProgressValue;
 		};
-#endif
 
 } // namespace Swi