--- a/dependencies/S3libs/bld.inf	Thu Apr 01 14:59:15 2010 +0100
+++ b/dependencies/S3libs/bld.inf	Fri Apr 02 20:17:48 2010 +0200
@@ -5,20 +5,20 @@
 featmgr.lib				\epoc32\release\winscw\udeb\featmgr.lib
 liwServiceHandler.lib	\epoc32\release\winscw\udeb\liwServiceHandler.lib
 AknLayout2Scalable.lib	\epoc32\release\winscw\udeb\AknLayout2Scalable.lib
-hscontentinfo.lib		\epoc32\release\winscw\udeb\hscontentinfo.lib
+// hscontentinfo.lib		\epoc32\release\winscw\udeb\hscontentinfo.lib
 SVGEngine.lib			\epoc32\release\winscw\udeb\SVGEngine.lib
 WidgetRegistryClient.lib	\epoc32\release\winscw\udeb\WidgetRegistryClient.lib
 CdlEngine.lib			\epoc32\release\winscw\udeb\CdlEngine.lib
 aknphysics.lib			\epoc32\release\winscw\udeb\aknphysics.lib
-hsccproviderclient.lib	\epoc32\release\winscw\udeb\hsccproviderclient.lib
+// hsccproviderclient.lib	\epoc32\release\winscw\udeb\hsccproviderclient.lib
 disknotifyhandler.lib	\epoc32\release\winscw\udeb\disknotifyhandler.lib
 aiwdialdata.lib			\epoc32\release\winscw\udeb\aiwdialdata.lib
 networkhandling.lib		\epoc32\release\winscw\udeb\networkhandling.lib
 akntransitionutils.lib		\epoc32\release\winscw\udeb\akntransitionutils.lib
 ssmcmn.lib			\epoc32\release\winscw\udeb\ssmcmn.lib
-hspswrapper.lib			\epoc32\release\winscw\udeb\hspswrapper.lib
-cpswrapper.lib			\epoc32\release\winscw\udeb\cpswrapper.lib
-hscontentcontrol.lib		\epoc32\release\winscw\udeb\hscontentcontrol.lib
+// hspswrapper.lib			\epoc32\release\winscw\udeb\hspswrapper.lib
+// cpswrapper.lib			\epoc32\release\winscw\udeb\cpswrapper.lib
+// hscontentcontrol.lib		\epoc32\release\winscw\udeb\hscontentcontrol.lib
 SatClient.lib			\epoc32\release\winscw\udeb\SatClient.lib
 sisregistryclient.lib		\epoc32\release\winscw\udeb\sisregistryclient.lib
 DrmServerInterfaces.lib		\epoc32\release\winscw\udeb\DrmServerInterfaces.lib
@@ -26,4 +26,5 @@
 DrmRightsInfo.lib		\epoc32\release\winscw\udeb\DrmRightsInfo.lib
 SWInstCli.lib			\epoc32\release\winscw\udeb\SWInstCli.lib
 fbscli.lib			\epoc32\release\winscw\udeb\fbscli.lib
-peninputClient.lib		\epoc32\release\winscw\udeb\peninputclient.lib
\ No newline at end of file
+peninputClient.lib		\epoc32\release\winscw\udeb\peninputclient.lib
+scppnwdl.lib			\epoc32\release\winscw\udeb\scppnwdl.lib
\ No newline at end of file

Binary file dependencies/S3libs/cpswrapper.lib has changed

Binary file dependencies/S3libs/hsccproviderclient.lib has changed

Binary file dependencies/S3libs/hscontentcontrol.lib has changed

Binary file dependencies/S3libs/hscontentinfo.lib has changed

Binary file dependencies/S3libs/hspswrapper.lib has changed

Binary file dependencies/S3libs/scppnwdl.lib has changed

--- a/dependencies/platform_paths.hrh	Thu Apr 01 14:59:15 2010 +0100
+++ b/dependencies/platform_paths.hrh	Fri Apr 02 20:17:48 2010 +0200
@@ -187,6 +187,10 @@
 // This should not be here, but I'm tired of adding this line to every
 // single MMP.
 #include <defaultcaps.hrh>
+// This should also not be here, but raptor won't work unless
+// LANGUAGE_IDS is defined.
+// remove this for the final build.
+#define LANGUAGE_IDS LANG sc 01
 
 /**
 **************************************************************************

--- a/group/bld.inf	Thu Apr 01 14:59:15 2010 +0100
+++ b/group/bld.inf	Fri Apr 02 20:17:48 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
+#include "../dependencies/platform_paths.hrh"
 
 PRJ_EXPORTS
 ../inc/aisystemuids.hrh              MW_LAYER_PLATFORM_EXPORT_PATH(aisystemuids.hrh)

--- a/homescreensrv_plat/hs_widget_publisher_api/bwins/hswidgetpublisheru.def	Thu Apr 01 14:59:15 2010 +0100
+++ b/homescreensrv_plat/hs_widget_publisher_api/bwins/hswidgetpublisheru.def	Fri Apr 02 20:17:48 2010 +0200
@@ -1,18 +1,21 @@
-EXPORTS
-	??0?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z @ 1 NONAME ABSENT; std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >::basic_string<char, class std::char_traits<char>, class std::allocator<char> >(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> > const &)
-	??0?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBDABV?$allocator@D@1@@Z @ 2 NONAME ABSENT; std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >::basic_string<char, class std::char_traits<char>, class std::allocator<char> >(char const *, class std::allocator<char> const &)
-	??0?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ @ 3 NONAME ABSENT; std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >::basic_string<char, class std::char_traits<char>, class std::allocator<char> >(void)
-	??0HsException@Hs@@QAE@H@Z @ 4 NONAME ; Hs::HsException::HsException(int)
-	??0HsWidgetPublisher@Hs@@QAE@PAVIHsDataObserver@1@@Z @ 5 NONAME ; Hs::HsWidgetPublisher::HsWidgetPublisher(class Hs::IHsDataObserver *)
-	??1HsException@Hs@@UAE@XZ @ 6 NONAME ; Hs::HsException::~HsException(void)
-	??1HsWidgetPublisher@Hs@@QAE@XZ @ 7 NONAME ; Hs::HsWidgetPublisher::~HsWidgetPublisher(void)
-	?createHsWidget@HsWidgetPublisher@Hs@@QAEAAVHsWidget@2@V?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@00@Z @ 8 NONAME ; class Hs::HsWidget & Hs::HsWidgetPublisher::createHsWidget(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
-	?getHsWidget@HsWidgetPublisher@Hs@@QAEAAVHsWidget@2@V?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@00@Z @ 9 NONAME ; class Hs::HsWidget & Hs::HsWidgetPublisher::getHsWidget(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
-	?getReason@HsException@Hs@@QAEHXZ @ 10 NONAME ; int Hs::HsException::getReason(void)
-	?publishHsWidget@HsWidgetPublisher@Hs@@QAEXAAVHsWidget@2@@Z @ 11 NONAME ; void Hs::HsWidgetPublisher::publishHsWidget(class Hs::HsWidget &)
-	?removeHsWidget@HsWidgetPublisher@Hs@@QAEXV?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@00@Z @ 12 NONAME ; void Hs::HsWidgetPublisher::removeHsWidget(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
-	?removeItem@HsWidget@Hs@@QAEXV?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @ 13 NONAME ; void Hs::HsWidget::removeItem(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
-	?setItem@HsWidget@Hs@@QAEXV?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z @ 14 NONAME ; void Hs::HsWidget::setItem(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
-	?setItem@HsWidget@Hs@@QAEXV?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z @ 15 NONAME ; void Hs::HsWidget::setItem(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, int)
-	?createHsWidgetWithDesc@HsWidgetPublisher@Hs@@QAEAAVHsWidget@2@V?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@0000@Z @ 16 NONAME ; class Hs::HsWidget & Hs::HsWidgetPublisher::createHsWidgetWithDesc(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
-
+EXPORTS
+	??0?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@ABV01@@Z @ 1 NONAME ABSENT ; std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >::basic_string<char, class std::char_traits<char>, class std::allocator<char> >(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> > const &)
+	??0?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@PBDABV?$allocator@D@1@@Z @ 2 NONAME ABSENT ; std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >::basic_string<char, class std::char_traits<char>, class std::allocator<char> >(char const *, class std::allocator<char> const &)
+	??0?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ @ 3 NONAME ABSENT ; std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >::basic_string<char, class std::char_traits<char>, class std::allocator<char> >(void)
+	??0HsException@Hs@@QAE@H@Z @ 4 NONAME ; Hs::HsException::HsException(int)
+	??0HsWidgetPublisher@Hs@@QAE@PAVIHsDataObserver@1@@Z @ 5 NONAME ; Hs::HsWidgetPublisher::HsWidgetPublisher(class Hs::IHsDataObserver *)
+	??1HsException@Hs@@UAE@XZ @ 6 NONAME ; Hs::HsException::~HsException(void)
+	??1HsWidgetPublisher@Hs@@QAE@XZ @ 7 NONAME ; Hs::HsWidgetPublisher::~HsWidgetPublisher(void)
+	?createHsWidget@HsWidgetPublisher@Hs@@QAEAAVHsWidget@2@V?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@00@Z @ 8 NONAME ; class Hs::HsWidget & Hs::HsWidgetPublisher::createHsWidget(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
+	?getHsWidget@HsWidgetPublisher@Hs@@QAEAAVHsWidget@2@V?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@00@Z @ 9 NONAME ; class Hs::HsWidget & Hs::HsWidgetPublisher::getHsWidget(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
+	?getReason@HsException@Hs@@QAEHXZ @ 10 NONAME ; int Hs::HsException::getReason(void)
+	?publishHsWidget@HsWidgetPublisher@Hs@@QAEXAAVHsWidget@2@@Z @ 11 NONAME ; void Hs::HsWidgetPublisher::publishHsWidget(class Hs::HsWidget &)
+	?removeHsWidget@HsWidgetPublisher@Hs@@QAEXV?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@00@Z @ 12 NONAME ; void Hs::HsWidgetPublisher::removeHsWidget(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
+	?removeItem@HsWidget@Hs@@QAEXV?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z @ 13 NONAME ; void Hs::HsWidget::removeItem(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
+	?setItem@HsWidget@Hs@@QAEXV?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@0@Z @ 14 NONAME ; void Hs::HsWidget::setItem(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
+	?setItem@HsWidget@Hs@@QAEXV?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z @ 15 NONAME ; void Hs::HsWidget::setItem(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, int)
+	?createHsWidgetWithDesc@HsWidgetPublisher@Hs@@QAEAAVHsWidget@2@V?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@0000@Z @ 16 NONAME ; class Hs::HsWidget & Hs::HsWidgetPublisher::createHsWidgetWithDesc(class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >, class std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >)
+	??0?$basic_string@GV?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@ABV01@@Z @ 17 NONAME ; std::basic_string<unsigned short, class std::char_traits<unsigned short>, class std::allocator<unsigned short> >::basic_string<unsigned short, class std::char_traits<unsigned short>, class std::allocator<unsigned short> >(class std::basic_string<unsigned short, class std::char_traits<unsigned short>, class std::allocator<unsigned short> > const &)
+	??0?$basic_string@GV?$char_traits@G@std@@V?$allocator@G@2@@std@@QAE@XZ @ 18 NONAME ; std::basic_string<unsigned short, class std::char_traits<unsigned short>, class std::allocator<unsigned short> >::basic_string<unsigned short, class std::char_traits<unsigned short>, class std::allocator<unsigned short> >(void)
+	?reserve@?$basic_string@DV?$char_traits@D@std@@V?$allocator@D@2@@std@@QAEXI@Z @ 19 NONAME ; void std::basic_string<char, class std::char_traits<char>, class std::allocator<char> >::reserve(unsigned int)
+