--- a/secureswitools/swisistools/source/interpretsislib/sisregistryobject.cpp	Thu Jul 15 18:47:04 2010 +0300
+++ b/secureswitools/swisistools/source/interpretsislib/sisregistryobject.cpp	Thu Aug 19 10:02:49 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-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"
@@ -146,7 +146,7 @@
 		iProperties.push_back(p);
 		}
 
-	const const CSISArray<CSISDependency, CSISFieldRoot::ESISDependency>& deps =
+	const CSISArray<CSISDependency, CSISFieldRoot::ESISDependency>& deps =
 		aSis.GetDependencies()->DependencyList();
 
 	for(i = 0; i < deps.size(); ++i)
@@ -401,9 +401,9 @@
 		}
 	else
 	{
-		std::string x;
 		std::string error = "can not retrieve localized vendor name";
-		throw InvalidSis(Ucs2ToUtf8((std::wstring)packageName,x), error, INVALID_SIS);
+		std::string x = wstring2string((std::wstring)packageName);
+		throw InvalidSis(x, error, INVALID_SIS);
 	}
 
 	// Signed by SU cert