diff -r b68fcd923911 -r b8d67d6176f5 phoneapp/phoneuistates/src/cphoneconference.cpp --- a/phoneapp/phoneuistates/src/cphoneconference.cpp Tue May 25 12:41:50 2010 +0300 +++ b/phoneapp/phoneuistates/src/cphoneconference.cpp Wed Jun 09 09:41:11 2010 +0300 @@ -17,6 +17,7 @@ // INCLUDES +#include #include #include #include @@ -41,6 +42,7 @@ #include "tphonecmdparamcallstatedata.h" #include "cphonekeys.h" #include "phonelogger.h" +#include "cphonepubsubproxy.h" // ================= MEMBER FUNCTIONS ======================= @@ -81,6 +83,10 @@ iViewCommandHandle->ExecuteCommandL( EPhoneViewSetGlobalNotifiersDisabled, &globalNotifierParam ); + CPhonePubSubProxy::Instance()->ChangePropertyValue( + KPSUidScreenSaver, + KScreenSaverAllowScreenSaver, + EPhoneScreensaverAllowed ); DefineAndSetHoldFlagL(); @@ -461,7 +467,12 @@ EPhoneViewGetCallIdByState, &callStateData ); if( callStateData.CallId() > KErrNotFound ) - { + { + CPhonePubSubProxy::Instance()->ChangePropertyValue( + KPSUidScreenSaver, + KScreenSaverAllowScreenSaver, + EPhoneScreensaverNotAllowed ); + UpdateCbaL( EPhoneCallHandlingCallWaitingCBA ); iStateMachine->ChangeState( EPhoneStateWaitingInSingle ); } @@ -839,6 +850,11 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::HandleDiallingL()"); + CPhonePubSubProxy::Instance()->ChangePropertyValue( + KPSUidScreenSaver, + KScreenSaverAllowScreenSaver, + EPhoneScreensaverNotAllowed ); + BeginUiUpdateLC(); CloseSelectionListL(); @@ -922,6 +938,11 @@ __LOGMETHODSTARTEND( EPhoneUIStates, "CPhoneConference::HandleIncomingL()"); + CPhonePubSubProxy::Instance()->ChangePropertyValue( + KPSUidScreenSaver, + KScreenSaverAllowScreenSaver, + EPhoneScreensaverNotAllowed ); + BeginUiUpdateLC(); // Hide the number entry if it exists