diff -r eede1356aa52 -r 0ba996a9b75d bluetoothengine/btsac/src/btsacState.cpp --- a/bluetoothengine/btsac/src/btsacState.cpp Thu Jul 15 18:50:18 2010 +0300 +++ b/bluetoothengine/btsac/src/btsacState.cpp Thu Aug 19 10:05:41 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2005 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -50,7 +50,7 @@ CBtsacState* CBtsacState::ErrorOnEntryL(TInt /*aReason*/) { TRACE_FUNC - return CBtsacListening::NewL(iParent, EGavdpResetReasonNone, KErrNone); + return CBtsacListening::NewL(iParent); } // ----------------------------------------------------------------------------- @@ -221,7 +221,7 @@ { TRACE_INFO((_L("CBtsacState::GAVDP_AbortStreamConfirm(), state %d"), GetStateIndex())) Parent().CompletePendingRequests(KCompleteAllReqs, KErrAbort); - TRAPD(err, Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, KErrDisconnected))); + TRAPD(err, Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EResetGavdp, KErrDisconnected))); if (err) { TRACE_INFO((_L("CBtsacState::GAVDP_AbortStreamConfirm() Couldn't change state."))) @@ -333,7 +333,7 @@ TRACE_INFO((_L("CBtsacState::GAVDP_AbortIndication(), state %d, SEID:%d"), GetStateIndex(), aSEID.SEID())) (void)aSEID; Parent().CompletePendingRequests(KCompleteAllReqs, KErrDisconnected); - TRAPD(err, Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EGavdpResetReasonGeneral, KErrDisconnected))) + TRAPD(err, Parent().ChangeStateL(CBtsacListening::NewL(Parent(), EResetGavdp, KErrDisconnected))) if(err) { TRACE_INFO((_L("CBtsacState::GAVDP_AbortIndication(), error! Couldn't change state")))