# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1270223410 -3600
# Node ID df659e3ed8b2efba48ecec6ece497ec24a3d2755
# Parent  15e4dd19031c281327899a56afa10ddc02201953
Transplant fix for Bug 2098 and latest version of the fix for Bug 1960

diff -r 15e4dd19031c -r df659e3ed8b2 group/bld.inf
--- a/group/bld.inf	Wed Mar 31 22:04:35 2010 +0300
+++ b/group/bld.inf	Fri Apr 02 16:50:10 2010 +0100
@@ -15,11 +15,6 @@
 *
 */
 
-#include <platform_paths.hrh>
-
-PRJ_EXPORTS
-../inc/aisystemuids.hrh              MW_LAYER_PLATFORM_EXPORT_PATH(aisystemuids.hrh)
-
 #include "../xcfw/group/bld.inf"
 #include "../homescreenpluginsrv/group/bld.inf"
 #include "../idlefw/group/bld.inf"
diff -r 15e4dd19031c -r df659e3ed8b2 homescreenpluginsrv/hspsresult/src/hspspluginidlist.cpp
--- a/homescreenpluginsrv/hspsresult/src/hspspluginidlist.cpp	Wed Mar 31 22:04:35 2010 +0300
+++ b/homescreenpluginsrv/hspsresult/src/hspspluginidlist.cpp	Fri Apr 02 16:50:10 2010 +0100
@@ -10,6 +10,7 @@
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
+* Leo Zheng - GCC-E compilation error fix (2098)
 *
 * Description:  Class ChspsPluginIdList is a HSPS utility class for passing
 * 				 plugin ids from a client process to the server process.
@@ -30,7 +31,7 @@
 // might leave.
 // -----------------------------------------------------------------------------
 //
-EXPORT_C ChspsPluginIdList::ChspsPluginIdList( TInt aGranularity ) : CArrayFixFlat( aGranularity )
+EXPORT_C ChspsPluginIdList::ChspsPluginIdList( TInt aGranularity ) : CArrayFixFlat<TInt>( aGranularity )
     {
     }
 
diff -r 15e4dd19031c -r df659e3ed8b2 homescreensrv_plat/idlefw_api/group/bld.inf
--- a/homescreensrv_plat/idlefw_api/group/bld.inf	Wed Mar 31 22:04:35 2010 +0300
+++ b/homescreensrv_plat/idlefw_api/group/bld.inf	Fri Apr 02 16:50:10 2010 +0100
@@ -30,3 +30,5 @@
 ../inc/aiuiidleintegration.h     MW_LAYER_PLATFORM_EXPORT_PATH(aiuiidleintegration.h)
 ../inc/debug.h                   MW_LAYER_PLATFORM_EXPORT_PATH(debug.h) // needed?
 ../inc/aifwdefs.h                MW_LAYER_PLATFORM_EXPORT_PATH(aifwdefs.h)
+
+../../../inc/aisystemuids.hrh              MW_LAYER_PLATFORM_EXPORT_PATH(aisystemuids.hrh)