--- a/installationservices/swinstallationfw/source/sifutils.cpp	Fri Mar 19 09:33:35 2010 +0200
+++ b/installationservices/swinstallationfw/source/sifutils.cpp	Fri Apr 16 15:05:20 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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"
@@ -19,44 +19,55 @@
 
 #include <usif/scr/scr.h>
 #include <usif/sts/sts.h>
-
-namespace Usif
-	{
-	EXPORT_C void UninstallL(TComponentId aComponentId)
-		{
-		// Connect to the SCR and start a transaction
-		RSoftwareComponentRegistry scr;
-		User::LeaveIfError(scr.Connect());
-		CleanupClosePushL(scr);
-		scr.CreateTransactionL();
-
-		// Connect to the STS and start a transaction
-		RStsSession sts;
-		sts.CreateTransactionL();
-		CleanupClosePushL(sts);
-
-		// Get a list of files to be deleted
-		RSoftwareComponentRegistryFilesList fileList;
-		fileList.OpenListL(scr, aComponentId);
-		CleanupClosePushL(fileList);
+#include "sifutils.h"
+#include "scr_internal.h"
 
+EXPORT_C void Usif::UninstallL(TComponentId aComponentId)
+	{
+	// Connect to the SCR and start a transaction
+	RSoftwareComponentRegistry scr;
+	User::LeaveIfError(scr.Connect());
+	CleanupClosePushL(scr);
+	scr.CreateTransactionL();
+		// Connect to the STS and start a transaction
+	RStsSession sts;
+	sts.CreateTransactionL();
+	CleanupClosePushL(sts);
+		// Get a list of files to be deleted
+	RSoftwareComponentRegistryFilesList fileList;
+	fileList.OpenListL(scr, aComponentId);
+	CleanupClosePushL(fileList);
 		// Unregister and delete the files from iFileList
-		HBufC* file = NULL;
-		while ((file = fileList.NextFileL()) != NULL)
-			{
-			CleanupStack::PushL(file);
-			sts.RemoveL(*file);
-			CleanupStack::PopAndDestroy(file);
-			}
-		CleanupStack::PopAndDestroy(&fileList);
+	HBufC* file = NULL;
+	while ((file = fileList.NextFileL()) != NULL)
+		{
+		CleanupStack::PushL(file);
+		sts.RemoveL(*file);
+		CleanupStack::PopAndDestroy(file);
+		}
+	CleanupStack::PopAndDestroy(&fileList);
+	
+	// Delete the component from the SCR
+	scr.DeleteComponentL(aComponentId);
 
-		// Delete the component from the SCR
-		scr.DeleteComponentL(aComponentId);
+	// Commit the STS & SCR transactions
+	sts.CommitL();
+	scr.CommitTransactionL();
+	CleanupStack::PopAndDestroy(2, &scr);
+	}
+	
+EXPORT_C TUid Usif::GenerateNewAppUidL()
+    {
+    // Connect to SCR using the internal client.
+    RScrInternalClient scr;
+    User::LeaveIfError(scr.Connect());
+    CleanupClosePushL(scr);
+    
+	//Request for an unused UID.
+    TUid generatedUid = scr.GenerateNewAppUidL();
+    
+    CleanupStack::PopAndDestroy(&scr);
+    return generatedUid;
+}
 
-		// Commit the STS & SCR transactions
-		sts.CommitL();
-		scr.CommitTransactionL();
 
-		CleanupStack::PopAndDestroy(2, &scr);
-		}
-	} // namespace Usif