# HG changeset patch
# User srilekhas <srilekhas@symbian.org>
# Date 1282574343 -3600
# Node ID 99c8e3015c1dc602b8c1d64a9234fb3ab97f50f5
# Parent  fcdfafb36fe7e4b59922308cd7a9ec53a84c10a4# Parent  07b3ec0df2579fe9ef3f8c73da5e77eb94a854b9
Merge RCL_3 fixes with latest delivery.

diff -r fcdfafb36fe7 -r 99c8e3015c1d commonuisupport/uikon/group/BLD.INF
--- a/commonuisupport/uikon/group/BLD.INF	Thu Aug 19 10:11:06 2010 +0300
+++ b/commonuisupport/uikon/group/BLD.INF	Mon Aug 23 15:39:03 2010 +0100
@@ -92,12 +92,12 @@
 ../EABI/EIKINITU.DEF             /epoc32/include/def/eabi/eikinitu.def
 
 // from ..\docs
-../docs/extended_notifier_design_spec.doc /epoc32/engdoc/application_framework/uikon/proposed/extended_notifier_design_spec.doc
-../docs/status_pane_design.doc /epoc32/engdoc/application_framework/uikon/status_pane_design.doc
-../docs/uikon_1.2_menu_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_menu_extensions.doc
-../docs/uikon_1.2_border_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_extensions.doc
-../docs/uikon_1.2_border_colours_utilities_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_colours_utilities_extensions.doc
-../docs/Uikon_1.2_Caps_Lock_Extension.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_caps_lock_extension.doc
+//../docs/extended_notifier_design_spec.doc /epoc32/engdoc/application_framework/uikon/proposed/extended_notifier_design_spec.doc
+//../docs/status_pane_design.doc /epoc32/engdoc/application_framework/uikon/status_pane_design.doc
+//../docs/uikon_1.2_menu_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_menu_extensions.doc
+//../docs/uikon_1.2_border_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_extensions.doc
+//../docs/uikon_1.2_border_colours_utilities_extensions.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_border_colours_utilities_extensions.doc
+//../docs/Uikon_1.2_Caps_Lock_Extension.doc /epoc32/engdoc/application_framework/uikon/uikon_1.2_caps_lock_extension.doc
 
 
 PRJ_MMPFILES
diff -r fcdfafb36fe7 -r 99c8e3015c1d lafagnosticuifoundation/bmpanimation/group/BLD.INF
--- a/lafagnosticuifoundation/bmpanimation/group/BLD.INF	Thu Aug 19 10:11:06 2010 +0300
+++ b/lafagnosticuifoundation/bmpanimation/group/BLD.INF	Mon Aug 23 15:39:03 2010 +0100
@@ -30,7 +30,7 @@
 ../inc/bmpansrv.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(bmpansrv.h)
 ../inc/bmpanconsts.h SYMBIAN_MW_LAYER_PUBLIC_EXPORT_PATH(bmpanconsts.h)
 
-../docs/animation_design_spec.doc /epoc32/engdoc/application_framework/bmpanim/animation_design_spec.doc
+//../docs/animation_design_spec.doc /epoc32/engdoc/application_framework/bmpanim/animation_design_spec.doc
 ../group/BmpAnim.iby	/epoc32/rom/include/bmpanim.iby
 
 PRJ_MMPFILES
diff -r fcdfafb36fe7 -r 99c8e3015c1d uifw/AvKon/src/aknlists.cpp
diff -r fcdfafb36fe7 -r 99c8e3015c1d uifw/EikStd/coctlsrc/AknClearer.cpp
--- a/uifw/EikStd/coctlsrc/AknClearer.cpp	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/EikStd/coctlsrc/AknClearer.cpp	Mon Aug 23 15:39:03 2010 +0100
@@ -135,9 +135,11 @@
 		EnableWindowTransparency();
 		}
 
+#ifndef NO_ALF_OBSERVER
     CAlfEffectObserver* alfEffectObserver = CAlfEffectObserver::NewL(); 
     alfEffectObserver->SetDistractionWindow(*DrawableWindow());
     delete alfEffectObserver;
+#endif
 
 	iFlags.Assign(EAknScreenClearerBlankAppStatusPane, aBlankAppStatusPane);
 
diff -r fcdfafb36fe7 -r 99c8e3015c1d uifw/EikStd/coctlsrc/EIKCOCTL.MMP
--- a/uifw/EikStd/coctlsrc/EIKCOCTL.MMP	Thu Aug 19 10:11:06 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKCOCTL.MMP	Mon Aug 23 15:39:03 2010 +0100
@@ -40,6 +40,7 @@
 APP_LAYER_SYSTEMINCLUDE
 OS_LAYER_LIBC_SYSTEMINCLUDE
 
+MACRO  NO_ALF_OBSERVER    // break link to alf server
 
 SOURCE          Aknedsts.cpp
 SOURCE          Aknscbut.cpp