# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1283449275 -10800
# Node ID ca0622003710d9ea57e409aee909cf30b7f8dd6c
# Parent  31c16e0c5e3e06879a774333da4fd1daeb3aced3
Revision: 201033
Kit: 201035

diff -r 31c16e0c5e3e -r ca0622003710 uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp
--- a/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp	Wed Aug 18 10:02:14 2010 +0300
+++ b/uifw/AknGlobalUI/AknCapServer/group/AknCapServer.mmp	Thu Sep 02 20:41:15 2010 +0300
@@ -114,10 +114,6 @@
 LIBRARY         aknlistloadertfx.lib
 #endif // RD_UI_TRANSITION_EFFECTS_LIST
 
-#ifdef SYMBIAN_BUILD_GCE
-LIBRARY         alfclient.lib
-#endif // SYMBIAN_BUILD_GCE
-
 // #define WCPLOG WCPLOG
 #ifdef WCPLOG
 LIBRARY         flogger.lib
diff -r 31c16e0c5e3e -r ca0622003710 uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp
--- a/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp	Wed Aug 18 10:02:14 2010 +0300
+++ b/uifw/AknGlobalUI/AknCapServer/src/AknCapServerEntry.cpp	Thu Sep 02 20:41:15 2010 +0300
@@ -73,10 +73,6 @@
     #include <akntranseffect.h> // for Transition effect enumerations
 #endif
 
-#ifdef SYMBIAN_BUILD_GCE
-    #include <alf/alfclientbase.h>
-#endif    
-
 #ifdef RD_INTELLIGENT_TEXT_INPUT
 #include <AvkonInternalCRKeys.h>
 
@@ -228,11 +224,7 @@
 
     me->iEikSrv.AllowNotifierAppServersToLoad();
     me->iEikSrv.Close(); // currently there is no use to keep this session alive.
-    
-#ifdef SYMBIAN_BUILD_GCE
-    TRAP(err, CAlfAsynchStartup::StartL());
-#endif     
-    
+
     return err;
     }
 
diff -r 31c16e0c5e3e -r ca0622003710 uifw/AvKon/conf/s60/avkon.confml
Binary file uifw/AvKon/conf/s60/avkon.confml has changed
diff -r 31c16e0c5e3e -r ca0622003710 uiutils/hlplch/group/hlplch.mmp
--- a/uiutils/hlplch/group/hlplch.mmp	Wed Aug 18 10:02:14 2010 +0300
+++ b/uiutils/hlplch/group/hlplch.mmp	Thu Sep 02 20:41:15 2010 +0300
@@ -31,6 +31,7 @@
 
 START RESOURCE	../data/lch.rss
 TARGETPATH		resource/apps
+HEADER
 END
 
 LIBRARY			euser.lib	apgrfx.lib	eikcore.lib	apparc.lib bafl.lib efsrv.lib