diff -r 91746b151f97 -r 997690c3397a bluetoothengine/btui/btuidelegate/btdelegatevisibility.cpp --- a/bluetoothengine/btui/btuidelegate/btdelegatevisibility.cpp Fri Jun 11 13:48:51 2010 +0300 +++ b/bluetoothengine/btui/btuidelegate/btdelegatevisibility.cpp Wed Jun 23 18:23:52 2010 +0300 @@ -34,7 +34,7 @@ { TRAP_IGNORE( mBtengSettings = CBTEngSettings::NewL(this) ); Q_CHECK_PTR( mBtengSettings ); - mOperationOngoing = false; + mActiveHandling = false; } /*! @@ -54,12 +54,12 @@ { int minutes, err = 0; - if (mOperationOngoing) { + if (mActiveHandling) { // complete command with error emit commandCompleted(KErrInUse); return; } - mOperationOngoing = true; + mActiveHandling = true; // read 1st parameter BTUI_ASSERT_X(params.toList().at(0).isValid(), "BtDelegateVisibility::exec", "invalid parameter"); @@ -70,12 +70,12 @@ TBTVisibilityMode visibilityMode( EBTVisibilityModeNoScans ); err = mBtengSettings->GetVisibilityMode( visibilityMode ); if (err) { - mOperationOngoing = false; + mActiveHandling = false; emit commandCompleted(err); return; } if (visibilityMode == mOperation) { - mOperationOngoing = false; + mActiveHandling = false; emit commandCompleted(KErrNone); return; } @@ -100,7 +100,7 @@ } if (err) { // complete command with error - mOperationOngoing = false; + mActiveHandling = false; emit commandCompleted(err); } } @@ -118,9 +118,9 @@ */ void BtDelegateVisibility::VisibilityModeChanged( TBTVisibilityMode aState ) { - if (mOperationOngoing) { + if (mActiveHandling) { //Error handling has to be done, if value is not set properly. - mOperationOngoing = false; + mActiveHandling = false; if (mOperation == aState) { emit commandCompleted(KErrNone); }