Merge workaround for bug 2846 to conditionally compile out the use of CAlfEffectObserver. RCL_3 PDK_3.0.1
authorPat Downey <patd@symbian.org>
Tue, 13 Jul 2010 11:36:42 +0100
branchRCL_3
changeset 43 07b3ec0df257
parent 42 6b0a8425dd42 (current diff)
parent 27 d304fad47bf4 (diff)
child 52 99c8e3015c1d
Merge workaround for bug 2846 to conditionally compile out the use of CAlfEffectObserver.
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);
 
--- 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