# HG changeset patch
# User srilekhas <srilekhas@symbian.org>
# Date 1287758944 -3600
# Node ID 7437a26b11d0fbc297b3960281782ef335ea859d
# Parent  a5e7a4f63858961057641b36e95bf551aaf297ca# Parent  3ef26114864fc39d807df732664d379f4cfad18c
Merge RCL_3 Fixes to Bug 2846,Bug 2584,Bug 2012

diff -r a5e7a4f63858 -r 7437a26b11d0 commonuisupport/uikon/group/BLD.INF
--- a/commonuisupport/uikon/group/BLD.INF	Wed Oct 13 14:50:15 2010 +0300
+++ b/commonuisupport/uikon/group/BLD.INF	Fri Oct 22 15:49:04 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 a5e7a4f63858 -r 7437a26b11d0 lafagnosticuifoundation/bmpanimation/group/BLD.INF
--- a/lafagnosticuifoundation/bmpanimation/group/BLD.INF	Wed Oct 13 14:50:15 2010 +0300
+++ b/lafagnosticuifoundation/bmpanimation/group/BLD.INF	Fri Oct 22 15:49:04 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 a5e7a4f63858 -r 7437a26b11d0 uifw/AvKon/src/aknlists.cpp
diff -r a5e7a4f63858 -r 7437a26b11d0 uifw/EikStd/coctlsrc/AknClearer.cpp
--- a/uifw/EikStd/coctlsrc/AknClearer.cpp	Wed Oct 13 14:50:15 2010 +0300
+++ b/uifw/EikStd/coctlsrc/AknClearer.cpp	Fri Oct 22 15:49:04 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 a5e7a4f63858 -r 7437a26b11d0 uifw/EikStd/coctlsrc/EIKCOCTL.MMP
--- a/uifw/EikStd/coctlsrc/EIKCOCTL.MMP	Wed Oct 13 14:50:15 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKCOCTL.MMP	Fri Oct 22 15:49:04 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