--- a/group/screensaver.mmp Thu Jul 15 18:39:54 2010 +0300
+++ b/group/screensaver.mmp Thu Aug 19 09:55:47 2010 +0300
@@ -97,22 +97,22 @@
LIBRARY ws32.lib
LIBRARY CommonEngine.lib
LIBRARY aknlayout.lib
-LIBRARY aknlayout2scalable.lib
+LIBRARY AknLayout2Scalable.lib
LIBRARY fbscli.lib
LIBRARY egul.lib
LIBRARY msgs.lib
LIBRARY bafl.lib
LIBRARY power_save_display_mode.lib
LIBRARY gdi.lib
-LIBRARY ProfileEng.lib
+LIBRARY profileeng.lib
LIBRARY hal.lib
-LIBRARY AknSkins.lib
-LIBRARY FeatMgr.lib // Feature Manager API
-LIBRARY AknIcon.lib
-LIBRARY AknPictograph.lib
+LIBRARY aknskins.lib
+LIBRARY featmgr.lib // Feature Manager API
+LIBRARY aknicon.lib
+LIBRARY aknpictograph.lib
LIBRARY ecom.lib
-LIBRARY CentralRepository.lib
-LIBRARY CenRepNotifHandler.lib
+LIBRARY centralrepository.lib
+LIBRARY cenrepnotifhandler.lib
LIBRARY efsrv.lib
LIBRARY flogger.lib
#ifdef RD_UI_TRANSITION_EFFECTS_PHASE2
--- a/inc/screensavershareddatai.h Thu Jul 15 18:39:54 2010 +0300
+++ b/inc/screensavershareddatai.h Thu Aug 19 09:55:47 2010 +0300
@@ -249,6 +249,16 @@
* Returns the pointer of the screensaver repository
*/
CRepository* ScreensaverRepository() const;
+
+public:
+ /*
+ * Get the flag of display changed
+ */
+ TBool GetDisplayObjChanged() const;
+ /*
+ * Set the flag of display changed
+ */
+ void SetDisplayObjChanged( TBool aChanged );
private:
@@ -388,6 +398,11 @@
* System startup completion flag
*/
TBool iStartupComplete;
+
+ /**
+ * Record display changed flag
+ */
+ TBool iDisplayChange;
};
#endif // C_SCREENSAVERSHAREDDATAI_H
--- a/scrsaver/screensaveraiwplugin/group/screensaveraiwplugin.mmp Thu Jul 15 18:39:54 2010 +0300
+++ b/scrsaver/screensaveraiwplugin/group/screensaveraiwplugin.mmp Thu Aug 19 09:55:47 2010 +0300
@@ -55,10 +55,10 @@
LIBRARY euser.lib
LIBRARY servicehandler.lib
-LIBRARY commonengine.lib // RConeResourceLoader
+LIBRARY CommonEngine.lib // RConeResourceLoader
LIBRARY cone.lib // CCoeEnv
LIBRARY efsrv.lib // TParse
LIBRARY avkon.lib
LIBRARY aknskinsrv.lib // RAknsSrvSession
LIBRARY imageconversion.lib // CImageDecoder
-LIBRARY CentralRepository.lib // CRepository
+LIBRARY centralrepository.lib // CRepository
Binary file scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/conf/screensaveranimplugin_1020744E.crml has changed
--- a/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/ScreenSaverAnimPlugin.mmp Thu Jul 15 18:39:54 2010 +0300
+++ b/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/ScreenSaverAnimPlugin.mmp Thu Aug 19 09:55:47 2010 +0300
@@ -69,18 +69,18 @@
LIBRARY cone.lib
LIBRARY efsrv.lib
LIBRARY bafl.lib
-LIBRARY CentralRepository.lib
-LIBRARY CenRepNotifHandler.lib
-LIBRARY drmhelper.lib
-LIBRARY aknicon.lib // AknIconUtils
-LIBRARY AknLayout2.lib // Scalable UI
+LIBRARY centralrepository.lib
+LIBRARY cenrepnotifhandler.lib
+LIBRARY DrmHelper.lib
+LIBRARY aknicon.lib // AknIconUtils
+LIBRARY aknlayout2.lib // Scalable UI
LIBRARY AknLayout2Scalable.lib // Scalable UI
-LIBRARY AknSkins.lib
+LIBRARY aknskins.lib
LIBRARY CdlEngine.lib // Scalable UI
LIBRARY avkon.lib
LIBRARY apgrfx.lib
LIBRARY apmime.lib
-LIBRARY MGFetch.lib
+LIBRARY mgfetch.lib
LIBRARY eikcoctl.lib
LIBRARY CommonEngine.lib
LIBRARY eikdlg.lib
--- a/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/src/ScreenSaverAnimPlugin.cpp Thu Jul 15 18:39:54 2010 +0300
+++ b/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/src/ScreenSaverAnimPlugin.cpp Thu Aug 19 09:55:47 2010 +0300
@@ -157,7 +157,6 @@
if ( err != KErrNone )
{
- iScreenSaverHost->RevertToDefaultSaver();
return err;
}
--- a/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/ScreenSaverGifAnimPluginEcom.mmp Thu Jul 15 18:39:54 2010 +0300
+++ b/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/ScreenSaverGifAnimPluginEcom.mmp Thu Aug 19 09:55:47 2010 +0300
@@ -59,6 +59,6 @@
LIBRARY eikcore.lib fbscli.lib gdi.lib
LIBRARY bitgdi.lib // CFbsBitmapDevice
LIBRARY ecom.lib
-LIBRARY IHL.LIB // MIHLFileImage
+LIBRARY IHL.lib // MIHLFileImage
LIBRARY efsrv.lib // RFs
LIBRARY bafl.lib // baflutils
--- a/scrsaver/scrsaverplugins/SlideshowPlugin/group/SlideshowPlugin.mmp Thu Jul 15 18:39:54 2010 +0300
+++ b/scrsaver/scrsaverplugins/SlideshowPlugin/group/SlideshowPlugin.mmp Thu Aug 19 09:55:47 2010 +0300
@@ -67,11 +67,11 @@
LIBRARY bafl.lib
LIBRARY ws32.lib
LIBRARY imageconversion.lib
-LIBRARY CentralRepository.lib
-LIBRARY CenRepNotifHandler.lib
-LIBRARY drmhelper.lib
+LIBRARY centralrepository.lib
+LIBRARY cenrepnotifhandler.lib
+LIBRARY DrmHelper.lib
LIBRARY platformenv.lib
-LIBRARY AknSkinSrv.lib
+LIBRARY aknskinsrv.lib
LIBRARY ContentListingFramework.lib
LIBRARY avkon.lib
LIBRARY eikdlg.lib
--- a/scrsaver/scrsaverplugins/SlideshowPlugin/src/SlideshowPlugin.cpp Thu Jul 15 18:39:54 2010 +0300
+++ b/scrsaver/scrsaverplugins/SlideshowPlugin/src/SlideshowPlugin.cpp Thu Aug 19 09:55:47 2010 +0300
@@ -789,16 +789,11 @@
void CSlideshowPlugin::LoadRandomSlidesL()
{
SSPLOGGER_ENTERFN("LoadRandomSlidesL()");
-
// Start by getting rid of possibly loaded slides
iModel->DeleteAll();
-
- // connect to MDS
+ // connect to MDS, load data or not
ConnectToMDSSessionL();
- // Wait for query of MDS to complete before continuing
- WaitForMDS();
-
SSPLOGGER_LEAVEFN("LoadRandomSlidesL()");
}
@@ -940,6 +935,8 @@
if (!iMdESession)
{
iMdESession = CMdESession::NewL( *this );
+ // Wait for query of MDS to complete before continuing
+ WaitForMDS();
}
}
--- a/src/screensaverctrlplugin.cpp Thu Jul 15 18:39:54 2010 +0300
+++ b/src/screensaverctrlplugin.cpp Thu Aug 19 09:55:47 2010 +0300
@@ -589,6 +589,13 @@
if( err != KErrNone )
{
// Loaded OK, but failed to initialize - cannot use plugin
+ TBool changed = Model().SharedDataInterface()->GetDisplayObjChanged();
+ if( !changed )
+ {
+ //Just activate the screensaver revert to defaultsaver
+ RevertToDefaultSaver();
+ }
+ Model().SharedDataInterface()->SetDisplayObjChanged( EFalse );
delete iPlugin;
iPlugin = NULL;
}
--- a/src/screensaverengine.cpp Thu Jul 15 18:39:54 2010 +0300
+++ b/src/screensaverengine.cpp Thu Aug 19 09:55:47 2010 +0300
@@ -228,15 +228,16 @@
StartPreviewTimer();
UpdateIndicatorAttributes();
-
+
+ if ( !View()->IsContentlessScreensaver() )
+ {
+ ScreensaverUtility::BringToForeground();
+ }
+
View()->ShowDisplayObject();
iSharedDataI->SetScreensaverPreviewState( EScreenSaverPreviewStart );
- if ( !View()->IsContentlessScreensaver() )
- {
- ScreensaverUtility::BringToForeground();
- }
iActivityManagerScreensaver->SetInactivityTimeout(0);
}
@@ -885,7 +886,10 @@
// compress all heaps (User::CompressAllHeaps() is a no-op)
User::Heap().Compress();
+ self->iSharedDataI->SetDisplayObjChanged( EFalse );
+
self->DisplayObject();
+
return KErrNone;
}
--- a/src/screensavershareddatai.cpp Thu Jul 15 18:39:54 2010 +0300
+++ b/src/screensavershareddatai.cpp Thu Aug 19 09:55:47 2010 +0300
@@ -683,6 +683,8 @@
DefineScreensaverProperties( KScreenSaverNoPowerSaveMode, KSSPolicyPass );
DefineScreensaverProperties( KScreenSaverActivate, KSSPolicyWriteUserData );
+
+ iDisplayChange = EFalse;
}
// -----------------------------------------------------------------------------
@@ -841,6 +843,8 @@
{
CScreensaverSharedDataI* self = STATIC_CAST(CScreensaverSharedDataI*, aPtr);
+ self->SetDisplayObjChanged( ETrue );
+
self->AppUi()->ScreensaverView()->SetDisplayObject( self->DisplayObjectType() );
return KErrNone;
@@ -937,6 +941,22 @@
iActiveProfile = NULL;
}
}
+// -----------------------------------------------------------------------------
+// CScreensaverSharedDataI::SetDisplayObjChanged
+// -----------------------------------------------------------------------------
+//
+void CScreensaverSharedDataI::SetDisplayObjChanged( TBool aChanged )
+ {
+ iDisplayChange = aChanged;
+ }
+// -----------------------------------------------------------------------------
+// CScreensaverSharedDataI::GetDisplayObjChanged
+// -----------------------------------------------------------------------------
+//
+TBool CScreensaverSharedDataI::GetDisplayObjChanged()const
+ {
+ return iDisplayChange;
+ }
// -----------------------------------------------------------------------------
// CScreensaverSharedDataI::AppUi