# HG changeset patch
# User Dario Sestito <darios@symbian.org>
# Date 1284734236 -3600
# Node ID 9f918e9840813f54df3e264b0b46c686300a6a96
# Parent  3321d3e205b60df74896ea89b7ad1959443d4537# Parent  20d75ec6647e3a219a98e7c829b1cc4ed12ec250
Merge in fixes for bug 1972 and bug 2840

diff -r 3321d3e205b6 -r 9f918e984081 idlehomescreen/widgetmanager/group/widgetmanager.mmp
--- a/idlehomescreen/widgetmanager/group/widgetmanager.mmp	Tue Sep 14 20:58:58 2010 +0300
+++ b/idlehomescreen/widgetmanager/group/widgetmanager.mmp	Fri Sep 17 15:37:16 2010 +0100
@@ -36,6 +36,8 @@
 
 CAPABILITY CAP_ECOM_PLUGIN
 
+MACRO NO_ALF_OBSERVER			// break link to ALF server
+
 SOURCEPATH      ../src
 SOURCE  wmpluginproxy.cpp
 SOURCE  wmplugin.cpp
diff -r 3321d3e205b6 -r 9f918e984081 idlehomescreen/widgetmanager/src/wmeffectmanager.cpp
--- a/idlehomescreen/widgetmanager/src/wmeffectmanager.cpp	Tue Sep 14 20:58:58 2010 +0300
+++ b/idlehomescreen/widgetmanager/src/wmeffectmanager.cpp	Fri Sep 17 15:37:16 2010 +0100
@@ -51,7 +51,9 @@
 //
 void CWmEffectManager::ConstructL()
     {
+#ifndef NO_ALF_OBSERVER
     iObserver = CAlfEffectObserver::NewL(); 
+#endif
     }
 
 // -----------------------------------------------------------------------------
@@ -160,6 +162,11 @@
 //
 TBool CWmEffectManager::WaitActiveEffect( TInt aInterval )     
     {
+    if (iObserver == NULL)
+        {
+        return ETrue;
+        }
+
     TBool retval( EFalse );
     TInt loop( aInterval / KWaitInterval );
     
@@ -202,7 +209,7 @@
 TBool CWmEffectManager::IsEffectActive()
     {
     TBool retVal( EFalse );
-    if ( iObserver->ActiveEffectsCount() )
+    if ( iObserver != NULL && iObserver->ActiveEffectsCount() )
         retVal = ETrue;
     return retVal;
     }
diff -r 3321d3e205b6 -r 9f918e984081 idlehomescreen/xmluirendering/uiengine/group/xnlayoutengine.mmp
--- a/idlehomescreen/xmluirendering/uiengine/group/xnlayoutengine.mmp	Tue Sep 14 20:58:58 2010 +0300
+++ b/idlehomescreen/xmluirendering/uiengine/group/xnlayoutengine.mmp	Fri Sep 17 15:37:16 2010 +0100
@@ -31,6 +31,8 @@
 CAPABILITY      CAP_GENERAL_DLL
 SOURCEPATH      ../src
 
+MACRO NO_ALF_OBSERVER     // disable link to ALF server
+
 SOURCE    xnapplication.cpp
 SOURCE    xnappuiadapter.cpp
 SOURCE    xnappuiadapterimpl.cpp
diff -r 3321d3e205b6 -r 9f918e984081 idlehomescreen/xmluirendering/uiengine/src/xneffectmanager.cpp
--- a/idlehomescreen/xmluirendering/uiengine/src/xneffectmanager.cpp	Tue Sep 14 20:58:58 2010 +0300
+++ b/idlehomescreen/xmluirendering/uiengine/src/xneffectmanager.cpp	Fri Sep 17 15:37:16 2010 +0100
@@ -73,8 +73,10 @@
     CTimer::ConstructL();
     
     OrientationChanged();
-    
+
+#ifndef NO_ALF_OBSERVER    
     iObserver = CAlfEffectObserver::NewL();
+#endif
     }
 
 // -----------------------------------------------------------------------------
@@ -277,8 +279,13 @@
 //
 TBool CXnEffectManager::WaitActiveEffect( TInt aInterval )     
     {
+    if (iObserver == NULL)
+        {
+        return ETrue;
+        }
+
     TBool retval( EFalse );
-    
+    	
     TInt loop( aInterval / KWaitInterval );
     
     while ( loop >= 0 )
diff -r 3321d3e205b6 -r 9f918e984081 idlehomescreen/xmluirendering/uiengine/src/xnnodeimpl.cpp
diff -r 3321d3e205b6 -r 9f918e984081 menufw/menusuites/foldersuite/group/foldersuite.mmp
--- a/menufw/menusuites/foldersuite/group/foldersuite.mmp	Tue Sep 14 20:58:58 2010 +0300
+++ b/menufw/menusuites/foldersuite/group/foldersuite.mmp	Fri Sep 17 15:37:16 2010 +0100
@@ -10,6 +10,7 @@
 * Nokia Corporation - initial contribution.
 *
 * Contributors:
+* Juha Ristolainen, Futurice Oy – Removed dummy dll compilation
 *
 * Description:  Project definition file for project folder suite.
 *