Merge workaround for bug 2846 to conditionally compile out the use of CAlfEffectObserver.
--- 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);
--- 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