diff -r e9b96e674847 -r 5b2a402e96ac usbengines/usbwatcher/src/cusbwatchersession.cpp --- a/usbengines/usbwatcher/src/cusbwatchersession.cpp Thu Jul 15 19:48:29 2010 +0300 +++ b/usbengines/usbwatcher/src/cusbwatchersession.cpp Thu Aug 19 10:54:11 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -159,9 +159,6 @@ aComplete = EFalse; iSetPersonalityOutstanding = ETrue; - //Set force parameter to this session. - SetAskOnConnectionSuppression( aMessage.Int1() ); - iUsbWatcherServer->Watcher().SetPersonality( aMessage.Int0(), static_cast( aMessage.Int2() ) ); @@ -183,7 +180,6 @@ return KErrNone; } - SetAskOnConnectionSuppression( EFalse ); aComplete = EFalse; iCancelSetPersonalityMessage = aMessage; iCancelSetPersonalityOutstanding = ETrue; @@ -211,7 +207,6 @@ // Cancel all other pending requests iUsbWatcherServer->Watcher().Notify( KErrCancel ); - SetAskOnConnectionSuppression( EFalse ); iSetPreviousPersonalityOutstanding = ETrue; iSetPreviousPersonalityMessage = aMessage; aComplete = EFalse; @@ -239,7 +234,6 @@ // Cancel all other pending requests iUsbWatcherServer->Watcher().Notify( KErrCancel ); - SetAskOnConnectionSuppression( EFalse ); iUsbWatcherServer->Watcher().SetPreviousPersonality(); return KErrNone; @@ -277,8 +271,6 @@ { LOG_FUNC - //connected currently, so ask on connection can be enabled - SetAskOnConnectionSuppression( EFalse ); iUsbWatcherServer->Watcher().SetPreviousPersonalityOnDisconnect(); return KErrNone; @@ -323,26 +315,4 @@ } } -// ---------------------------------------------------------------------------- -// Set or clear AskOnConnection suppression -// ---------------------------------------------------------------------------- -// -void CUsbWatcherSession::SetAskOnConnectionSuppression( TBool aSuppress ) - { - LOG_FUNC - - iSuppressAskOnConnection = aSuppress; - } - -// ---------------------------------------------------------------------------- -// Check if AskOnConnection is suppressed -// ---------------------------------------------------------------------------- -// -TBool CUsbWatcherSession::IsAskOnConnectionSuppressed() - { - LOG_FUNC - - return iSuppressAskOnConnection; - } - // End of file