--- a/appinstall_plat/sifui_api/src/sifui.cpp	Tue Jul 06 14:23:31 2010 +0300
+++ b/appinstall_plat/sifui_api/src/sifui.cpp	Wed Aug 18 09:55:45 2010 +0300
@@ -17,6 +17,7 @@
 
 #include "sifui.h"                              // CSifUi
 #include "sifuiprivate.h"                       // CSifUiPrivate
+#include "sifuierrorinfo.h"                     // CSifUiErrorInfo
 
 
 // ======== MEMBER FUNCTIONS ========
@@ -54,12 +55,12 @@
     }
 
 // ---------------------------------------------------------------------------
-// CSifUi::ShowConfirmationL()
+// CSifUi::ShowPreparingL()
 // ---------------------------------------------------------------------------
 //
-EXPORT_C TBool CSifUi::ShowConfirmationL( const CSifUiAppInfo& aAppInfo )
+EXPORT_C void CSifUi::ShowPreparingL()
     {
-    return iPrivate->ShowConfirmationL( aAppInfo );
+    iPrivate->ShowPreparingL();
     }
 
 // ---------------------------------------------------------------------------
@@ -72,15 +73,6 @@
     }
 
 // ---------------------------------------------------------------------------
-// CSifUi::SelectedDrive()
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TInt CSifUi::SelectedDrive( TInt& aDriveNumber )
-    {
-    return iPrivate->SelectedDrive( aDriveNumber );
-    }
-
-// ---------------------------------------------------------------------------
 // CSifUi::SetCertificateInfoL()
 // ---------------------------------------------------------------------------
 //
@@ -91,13 +83,31 @@
     }
 
 // ---------------------------------------------------------------------------
+// CSifUi::ShowConfirmationL()
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TBool CSifUi::ShowConfirmationL( const CSifUiAppInfo& aAppInfo )
+    {
+    return iPrivate->ShowConfirmationL( aAppInfo );
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUi::SelectedDrive()
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TInt CSifUi::SelectedDrive( TInt& aDriveNumber )
+    {
+    return iPrivate->SelectedDrive( aDriveNumber );
+    }
+
+// ---------------------------------------------------------------------------
 // CSifUi::ShowProgressL()
 // ---------------------------------------------------------------------------
 //
 EXPORT_C void CSifUi::ShowProgressL( const CSifUiAppInfo& aAppInfo,
-        TInt aProgressBarFinalValue )
+        TInt aProgressBarFinalValue, TInstallingPhase aPhase )
     {
-    iPrivate->ShowProgressL( aAppInfo, aProgressBarFinalValue );
+    iPrivate->ShowProgressL( aAppInfo, aProgressBarFinalValue, aPhase );
     }
 
 // ---------------------------------------------------------------------------
@@ -119,15 +129,6 @@
     }
 
 // ---------------------------------------------------------------------------
-// CSifUi::SetButtonVisible()
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CSifUi::SetButtonVisible( TOptionalButton aButton, TBool aIsVisible )
-    {
-    iPrivate->SetButtonVisible( aButton, aIsVisible );
-    }
-
-// ---------------------------------------------------------------------------
 // CSifUi::ShowCompleteL()
 // ---------------------------------------------------------------------------
 //
@@ -140,10 +141,62 @@
 // CSifUi::ShowFailedL()
 // ---------------------------------------------------------------------------
 //
+EXPORT_C void CSifUi::ShowFailedL( const CSifUiErrorInfo& aErrorInfo )
+    {
+    iPrivate->ShowFailedL( aErrorInfo );
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUi::SetButtonVisible()
+// ---------------------------------------------------------------------------
+//
+EXPORT_C void CSifUi::SetButtonVisible( TOptionalButton aButton, TBool aIsVisible )
+    {
+    iPrivate->SetButtonVisible( aButton, aIsVisible );
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUi::ShowGrantCapabilitiesL()
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TBool CSifUi::ShowGrantCapabilitiesL( const TCapabilitySet& aCapabilities )
+    {
+    return iPrivate->ShowGrantCapabilitiesL( aCapabilities );
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUi::ShowSingleSelectionL()
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TBool CSifUi::ShowSingleSelectionL( const TDesC& aTitle,
+            const MDesCArray& aSelectableItems, TInt& aSelectedIndex )
+    {
+    return iPrivate->ShowSingleSelectionL( aTitle, aSelectableItems, aSelectedIndex );
+    }
+
+// ---------------------------------------------------------------------------
+// CSifUi::ShowMultiSelectionL()
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TBool CSifUi::ShowMultiSelectionL( const TDesC& aTitle,
+            const MDesCArray& aSelectableItems, RArray<TInt>& aSelectedIndexes )
+    {
+    return iPrivate->ShowMultiSelectionL( aTitle, aSelectableItems, aSelectedIndexes );
+    }
+
+
+// ---------------------------------------------------------------------------
+// CSifUi::ShowFailedL()
+// ---------------------------------------------------------------------------
+//
+// TODO: This function is deprecated, remove it completely.
 EXPORT_C void CSifUi::ShowFailedL( TInt aErrorCode, const TDesC& aErrorMessage,
         const TDesC& aErrorDetails )
     {
-    iPrivate->ShowFailedL( aErrorCode, aErrorMessage, aErrorDetails );
+    CSifUiErrorInfo* errorInfo = CSifUiErrorInfo::NewLC( Usif::EUnknown, aErrorCode,
+            0, aErrorMessage, aErrorDetails );
+    iPrivate->ShowFailedL( *errorInfo );
+    CleanupStack::PopAndDestroy( errorInfo );
     }
 
 // ---------------------------------------------------------------------------