Merge RCL_3 fixes with latest delivery.
--- a/idlehomescreen/widgetmanager/group/widgetmanager.mmp Thu Aug 19 09:43:35 2010 +0300
+++ b/idlehomescreen/widgetmanager/group/widgetmanager.mmp Mon Aug 23 13:49:03 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
--- a/idlehomescreen/widgetmanager/src/wmeffectmanager.cpp Thu Aug 19 09:43:35 2010 +0300
+++ b/idlehomescreen/widgetmanager/src/wmeffectmanager.cpp Mon Aug 23 13:49:03 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;
}
--- a/idlehomescreen/xmluirendering/uiengine/group/xnlayoutengine.mmp Thu Aug 19 09:43:35 2010 +0300
+++ b/idlehomescreen/xmluirendering/uiengine/group/xnlayoutengine.mmp Mon Aug 23 13:49:03 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
--- a/idlehomescreen/xmluirendering/uiengine/src/xneffectmanager.cpp Thu Aug 19 09:43:35 2010 +0300
+++ b/idlehomescreen/xmluirendering/uiengine/src/xneffectmanager.cpp Mon Aug 23 13:49:03 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 )
--- a/menufw/menusuites/foldersuite/group/foldersuite.mmp Thu Aug 19 09:43:35 2010 +0300
+++ b/menufw/menusuites/foldersuite/group/foldersuite.mmp Mon Aug 23 13:49:03 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.
*