# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1272029573 -3600
# Node ID 47a0b3d74f76064d7c02418a0357a7e49342e769
# Parent  a0713522ab97f3773da2bf6dd478ee680638509b# Parent  d01c4da1f0fd5f904db89b1bc01a8e459ddde512
Remerge fixes for bugs 1726 and 1960.

diff -r a0713522ab97 -r 47a0b3d74f76 group/bld.inf
--- a/group/bld.inf	Wed Apr 14 16:16:44 2010 +0300
+++ b/group/bld.inf	Fri Apr 23 14:32:53 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 a0713522ab97 -r 47a0b3d74f76 homescreenpluginsrv/hspsresult/src/hspspluginidlist.cpp
--- a/homescreenpluginsrv/hspsresult/src/hspspluginidlist.cpp	Wed Apr 14 16:16:44 2010 +0300
+++ b/homescreenpluginsrv/hspsresult/src/hspspluginidlist.cpp	Fri Apr 23 14:32:53 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 a0713522ab97 -r 47a0b3d74f76 homescreensrv_plat/idlefw_api/group/bld.inf
--- a/homescreensrv_plat/idlefw_api/group/bld.inf	Wed Apr 14 16:16:44 2010 +0300
+++ b/homescreensrv_plat/idlefw_api/group/bld.inf	Fri Apr 23 14:32:53 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)