# HG changeset patch
# User Pat Downey <patd@symbian.org>
# Date 1279017402 -3600
# Node ID 07b3ec0df2579fe9ef3f8c73da5e77eb94a854b9
# Parent  6b0a8425dd426816710f94e2f4bd191cfe65f3bc# Parent  d304fad47bf41118726314685263499fbcde0083
Merge workaround for bug 2846 to conditionally compile out the use of CAlfEffectObserver.

diff -r 6b0a8425dd42 -r 07b3ec0df257 uifw/EikStd/coctlsrc/AknClearer.cpp
--- a/uifw/EikStd/coctlsrc/AknClearer.cpp	Tue Jul 13 11:29:56 2010 +0100
+++ b/uifw/EikStd/coctlsrc/AknClearer.cpp	Tue Jul 13 11:36:42 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 6b0a8425dd42 -r 07b3ec0df257 uifw/EikStd/coctlsrc/EIKCOCTL.MMP
--- a/uifw/EikStd/coctlsrc/EIKCOCTL.MMP	Tue Jul 13 11:29:56 2010 +0100
+++ b/uifw/EikStd/coctlsrc/EIKCOCTL.MMP	Tue Jul 13 11:36:42 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