# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286969580 -10800 # Node ID 8f536f98e1f86246ac5b5779565f5f8fb933ddf8 # Parent 65be1d84df1f856b6411e13545fd58b3297b3a6e Revision: 201039 Kit: 201041 diff -r 65be1d84df1f -r 8f536f98e1f8 group/screensaver.mmp --- a/group/screensaver.mmp Wed Sep 15 12:13:53 2010 +0300 +++ b/group/screensaver.mmp Wed Oct 13 14:33:00 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 diff -r 65be1d84df1f -r 8f536f98e1f8 inc/screensavershareddatai.h --- a/inc/screensavershareddatai.h Wed Sep 15 12:13:53 2010 +0300 +++ b/inc/screensavershareddatai.h Wed Oct 13 14:33:00 2010 +0300 @@ -249,16 +249,6 @@ * 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: @@ -398,11 +388,6 @@ * System startup completion flag */ TBool iStartupComplete; - - /** - * Record display changed flag - */ - TBool iDisplayChange; }; #endif // C_SCREENSAVERSHAREDDATAI_H diff -r 65be1d84df1f -r 8f536f98e1f8 scrsaver/screensaveraiwplugin/group/screensaveraiwplugin.mmp --- a/scrsaver/screensaveraiwplugin/group/screensaveraiwplugin.mmp Wed Sep 15 12:13:53 2010 +0300 +++ b/scrsaver/screensaveraiwplugin/group/screensaveraiwplugin.mmp Wed Oct 13 14:33:00 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 diff -r 65be1d84df1f -r 8f536f98e1f8 scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/conf/screensaveranimplugin_1020744E.crml Binary file scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/conf/screensaveranimplugin_1020744E.crml has changed diff -r 65be1d84df1f -r 8f536f98e1f8 scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/ScreenSaverAnimPlugin.mmp --- a/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/ScreenSaverAnimPlugin.mmp Wed Sep 15 12:13:53 2010 +0300 +++ b/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/group/ScreenSaverAnimPlugin.mmp Wed Oct 13 14:33:00 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 diff -r 65be1d84df1f -r 8f536f98e1f8 scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/src/ScreenSaverAnimPlugin.cpp --- a/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/src/ScreenSaverAnimPlugin.cpp Wed Sep 15 12:13:53 2010 +0300 +++ b/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/src/ScreenSaverAnimPlugin.cpp Wed Oct 13 14:33:00 2010 +0300 @@ -157,6 +157,7 @@ if ( err != KErrNone ) { + iScreenSaverHost->RevertToDefaultSaver(); return err; } diff -r 65be1d84df1f -r 8f536f98e1f8 scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/ScreenSaverGifAnimPluginEcom.mmp --- a/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/ScreenSaverGifAnimPluginEcom.mmp Wed Sep 15 12:13:53 2010 +0300 +++ b/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/group/ScreenSaverGifAnimPluginEcom.mmp Wed Oct 13 14:33:00 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 diff -r 65be1d84df1f -r 8f536f98e1f8 scrsaver/scrsaverplugins/SlideshowPlugin/group/SlideshowPlugin.mmp --- a/scrsaver/scrsaverplugins/SlideshowPlugin/group/SlideshowPlugin.mmp Wed Sep 15 12:13:53 2010 +0300 +++ b/scrsaver/scrsaverplugins/SlideshowPlugin/group/SlideshowPlugin.mmp Wed Oct 13 14:33:00 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 diff -r 65be1d84df1f -r 8f536f98e1f8 scrsaver/scrsaverplugins/SlideshowPlugin/inc/SlideshowPlugin.h --- a/scrsaver/scrsaverplugins/SlideshowPlugin/inc/SlideshowPlugin.h Wed Sep 15 12:13:53 2010 +0300 +++ b/scrsaver/scrsaverplugins/SlideshowPlugin/inc/SlideshowPlugin.h Wed Oct 13 14:33:00 2010 +0300 @@ -354,9 +354,6 @@ // MDS session CMdESession* iMdESession; - - // MDS query owned - CMdEObjectQuery* iQuery; }; diff -r 65be1d84df1f -r 8f536f98e1f8 scrsaver/scrsaverplugins/SlideshowPlugin/src/SlideshowPlugin.cpp --- a/scrsaver/scrsaverplugins/SlideshowPlugin/src/SlideshowPlugin.cpp Wed Sep 15 12:13:53 2010 +0300 +++ b/scrsaver/scrsaverplugins/SlideshowPlugin/src/SlideshowPlugin.cpp Wed Oct 13 14:33:00 2010 +0300 @@ -134,19 +134,8 @@ delete iDrmHelper; delete iModel; - // Close and delete mds query - if ( iQuery ) - { - iQuery->Cancel(); - delete iQuery; - iQuery = NULL; - } - - if ( iMdESession ) - { - delete iMdESession; - iMdESession = NULL; - } + // First model, then engine, otherwise bad things happen + delete iMdESession; // Logging done SSPLOGGER_DELETE; @@ -800,11 +789,16 @@ void CSlideshowPlugin::LoadRandomSlidesL() { SSPLOGGER_ENTERFN("LoadRandomSlidesL()"); + // Start by getting rid of possibly loaded slides iModel->DeleteAll(); - // connect to MDS, load data or not + + // connect to MDS ConnectToMDSSessionL(); + // Wait for query of MDS to complete before continuing + WaitForMDS(); + SSPLOGGER_LEAVEFN("LoadRandomSlidesL()"); } @@ -946,8 +940,6 @@ if (!iMdESession) { iMdESession = CMdESession::NewL( *this ); - // Wait for query of MDS to complete before continuing - WaitForMDS(); } } @@ -1012,9 +1004,9 @@ CMdEObjectDef& imageObjDef = defaultNamespaceDef.GetObjectDefL( MdeConstants::Image::KImageObject ); // query objects with object definition "Image" - iQuery = iMdESession->NewObjectQueryL( defaultNamespaceDef, imageObjDef, this ); + CMdEObjectQuery* query = iMdESession->NewObjectQueryL( defaultNamespaceDef, imageObjDef, this ); - iQuery->FindL( KDefaultRandomLoadingNumber ); + query->FindL( KDefaultRandomLoadingNumber ); } // ----------------------------------------------------------------------------- diff -r 65be1d84df1f -r 8f536f98e1f8 src/screensaverbase.cpp --- a/src/screensaverbase.cpp Wed Sep 15 12:13:53 2010 +0300 +++ b/src/screensaverbase.cpp Wed Oct 13 14:33:00 2010 +0300 @@ -84,7 +84,6 @@ { SCRLOGGER_WRITE("Model: StopScreenSaver(), exit power save"); LcdPartialMode()->Exit(); - Model().SharedDataInterface()->SetSSForcedLightsOn( ESSForceLightsOn ); } CancelTimer(); @@ -176,7 +175,7 @@ TUint16* addr = ( TUint16* )iOffScrnBmp->DataAddress(); err = LcdPartialMode()->Set( startLine, endLine, addr, aFullColors ); - Model().SharedDataInterface()->SetSSForcedLightsOn( ESSForceLightsOff ); + Model().SharedDataInterface()->SetSSForcedLightsOn( 0 ); } else { diff -r 65be1d84df1f -r 8f536f98e1f8 src/screensaverctrlplugin.cpp --- a/src/screensaverctrlplugin.cpp Wed Sep 15 12:13:53 2010 +0300 +++ b/src/screensaverctrlplugin.cpp Wed Oct 13 14:33:00 2010 +0300 @@ -63,6 +63,8 @@ void CScreensaverCtrlPlugin::StartTimer() { // Notify plugin that screensaver is starting + Model().SharedDataInterface()->SetSSForcedLightsOn( ESSForceLightsOn ); + SendPluginEvent( EScreensaverEventStarting ); @@ -282,7 +284,6 @@ SCRLOGGER_WRITE("Host: ExitPartialMode()"); LcdPartialMode()->Exit(); - Model().SharedDataInterface()->SetSSForcedLightsOn( ESSForceLightsOn ); // Make sure the partial area is empty // Make this less idiotic TRect psRect( 0, 0, 0, 0); @@ -588,13 +589,6 @@ 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; } diff -r 65be1d84df1f -r 8f536f98e1f8 src/screensaverengine.cpp --- a/src/screensaverengine.cpp Wed Sep 15 12:13:53 2010 +0300 +++ b/src/screensaverengine.cpp Wed Oct 13 14:33:00 2010 +0300 @@ -886,10 +886,7 @@ // compress all heaps (User::CompressAllHeaps() is a no-op) User::Heap().Compress(); - self->iSharedDataI->SetDisplayObjChanged( EFalse ); - self->DisplayObject(); - return KErrNone; } diff -r 65be1d84df1f -r 8f536f98e1f8 src/screensavershareddatai.cpp --- a/src/screensavershareddatai.cpp Wed Sep 15 12:13:53 2010 +0300 +++ b/src/screensavershareddatai.cpp Wed Oct 13 14:33:00 2010 +0300 @@ -683,8 +683,6 @@ DefineScreensaverProperties( KScreenSaverNoPowerSaveMode, KSSPolicyPass ); DefineScreensaverProperties( KScreenSaverActivate, KSSPolicyWriteUserData ); - - iDisplayChange = EFalse; } // ----------------------------------------------------------------------------- @@ -843,8 +841,6 @@ { CScreensaverSharedDataI* self = STATIC_CAST(CScreensaverSharedDataI*, aPtr); - self->SetDisplayObjChanged( ETrue ); - self->AppUi()->ScreensaverView()->SetDisplayObject( self->DisplayObjectType() ); return KErrNone; @@ -941,22 +937,6 @@ iActiveProfile = NULL; } } -// ----------------------------------------------------------------------------- -// CScreensaverSharedDataI::SetDisplayObjChanged -// ----------------------------------------------------------------------------- -// -void CScreensaverSharedDataI::SetDisplayObjChanged( TBool aChanged ) - { - iDisplayChange = aChanged; - } -// ----------------------------------------------------------------------------- -// CScreensaverSharedDataI::GetDisplayObjChanged -// ----------------------------------------------------------------------------- -// -TBool CScreensaverSharedDataI::GetDisplayObjChanged()const - { - return iDisplayChange; - } // ----------------------------------------------------------------------------- // CScreensaverSharedDataI::AppUi diff -r 65be1d84df1f -r 8f536f98e1f8 src/screensaverutility.cpp --- a/src/screensaverutility.cpp Wed Sep 15 12:13:53 2010 +0300 +++ b/src/screensaverutility.cpp Wed Oct 13 14:33:00 2010 +0300 @@ -132,8 +132,7 @@ } CAknTransitionUtils::RemoveData( KScreensaverCallStateChange ); #endif - CEikonEnv::Static()->RootWin().SetOrdinalPosition( - 0, ECoeWinPriorityNeverAtFront ); + CEikonEnv::Static()->BringForwards( EFalse ); }