diff -r 5554410e16f5 -r 36d7ded3ca23 mmsharing/livecommsui/lcuiengine/src/lcuiengine_p.cpp --- a/mmsharing/livecommsui/lcuiengine/src/lcuiengine_p.cpp Tue Jul 06 14:13:16 2010 +0300 +++ b/mmsharing/livecommsui/lcuiengine/src/lcuiengine_p.cpp Wed Aug 18 09:46:00 2010 +0300 @@ -48,6 +48,10 @@ #include #include #include +#include +#include +#include + #define LC_VTPLUGIN_NAME "Videotelephony"; @@ -1417,13 +1421,38 @@ // bool LcUiEnginePrivate::isAllowedToShareVideo() { - LC_QDEBUG( "livecomms [UI] -> LcUiEnginePrivate::isAllowedToShareVideo()" ) - if( featureSupported( CLcEngine::ELcSendVideoQuery ) && mShareOwnVideoQuery ){ - mShareOwnVideoQuery->show(); - return false; - } + LC_QDEBUG( "livecomms [UI] -> LcUiEnginePrivate::isAllowedToShareVideo()" ) + if (!featureSupported( CLcEngine::ELcSendVideoQuery )) //outgoing videocall + return true; + else { //incoming videocall + int ownVtVideoSendingSetting = vtVideoSendingSetting(); + if (VTSETTING_SHOW_AUTOMATICALLY == ownVtVideoSendingSetting) + return true; + else if (VTSETTING_DO_NOT_SHOW == ownVtVideoSendingSetting) + return false; + else { + if (mShareOwnVideoQuery) + mShareOwnVideoQuery->show(); + return false; + } + } LC_QDEBUG( "livecomms [UI] <- LcUiEnginePrivate::isAllowedToShareVideo()" ) - return true; +} + +// ----------------------------------------------------------------------------- +// LcUiEnginePrivate::vtVideoSendingSetting +// ----------------------------------------------------------------------------- +// +int LcUiEnginePrivate::vtVideoSendingSetting() +{ + LC_QDEBUG( "livecomms [UI] -> LcUiEnginePrivate::vtVideoSendingSetting()" ) + XQSettingsManager settings; + XQSettingsKey settingsKey(XQSettingsKey::TargetCentralRepository, + KCRUidTelephonySettings.iUid, + KSettingsVTVideoSending); + QVariant ownVtVideoSendingSetting = settings.readItemValue(settingsKey); + LC_QDEBUG( "livecomms [UI] <- LcUiEnginePrivate::vtVideoSendingSetting()" ) + return ownVtVideoSendingSetting.toInt(); } // -----------------------------------------------------------------------------