# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1271250540 -10800 # Node ID f7fbeaeb166a8caac8136b3ed4165f16abc26a80 # Parent b6f55cd40afdddfa21051427fda4bedef674bcfe Revision: 201013 Kit: 201015 diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bteng/btrfsplugin/src/btrfsplugin.cpp --- a/bluetoothengine/bteng/btrfsplugin/src/btrfsplugin.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/bteng/btrfsplugin/src/btrfsplugin.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -77,10 +77,14 @@ TRACE_FUNC_EXIT } -void CBTRFSPlugin::GetScriptL( const TRfsReason /*aType*/, TDes& aPath ) +void CBTRFSPlugin::GetScriptL( const TRfsReason aType, TDes& aPath ) { TRACE_FUNC_ENTRY - aPath.Copy( KScriptPath); + ASSERT(aType == EDeepRfs || aType == ENormalRfs); // ECOM default data specifies only these two types + if(aType == EDeepRfs) + { + aPath.Copy(KScriptPath); + } TRACE_FUNC_EXIT } diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bteng/conf/bteng.confml Binary file bluetoothengine/bteng/conf/bteng.confml has changed diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bteng/conf/bteng_10204DAC.crml Binary file bluetoothengine/bteng/conf/bteng_10204DAC.crml has changed diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bteng/data/btrfs.txt Binary file bluetoothengine/bteng/data/btrfs.txt has changed diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bteng/group/bld.inf --- a/bluetoothengine/bteng/group/bld.inf Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/bteng/group/bld.inf Wed Apr 14 16:09:00 2010 +0300 @@ -29,9 +29,7 @@ ../inc/btotgpairpub.inl |../../inc/btotgpairpub.inl ../inc/btengutil.h |../../inc/btengutil.h ../rom/bteng.iby CORE_MW_LAYER_IBY_EXPORT_PATH(bteng.iby) -../data/10204DA9.xml /epoc32/release/winscw/udeb/z/private/2000B187/10204DA9.xml -../data/10204DA9.xml /epoc32/release/winscw/urel/z/private/2000B187/10204DA9.xml -../data/10204DA9.xml /epoc32/data/z/private/2000B187/10204DA9.xml +../data/10204DA9.xml z:/private/2000B187/10204DA9.xml ../conf/bteng.confml MW_LAYER_CONFML(bteng.confml) ../conf/bteng_10204DA9.crml MW_LAYER_CRML(bteng_10204DA9.crml) @@ -39,9 +37,7 @@ ../conf/bteng_10204DAB.crml MW_LAYER_CRML(bteng_10204DAB.crml) ../conf/bteng_10204DAC.crml MW_LAYER_CRML(bteng_10204DAC.crml) -../data/btrfs.txt /epoc32/data/z/resource/btrfs.txt -../data/btrfs.txt /epoc32/release/winscw/udeb/z/resource/btrfs.txt -../data/btrfs.txt /epoc32/release/winscw/urel/z/resource/btrfs.txt +../data/btrfs.txt z:/resource/btrfs.txt PRJ_MMPFILES diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bteng/group/bteng.mmp --- a/bluetoothengine/bteng/group/bteng.mmp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/bteng/group/bteng.mmp Wed Apr 14 16:09:00 2010 +0300 @@ -64,10 +64,6 @@ LIBRARY aknnotify.lib LIBRARY btfeatures.lib -#ifndef SETLOCALNAME -LIBRARY btengsettings.lib -#endif - LIBRARY btpowercontrol.lib #ifndef __WINS__ LIBRARY dutmode.lib diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bteng/inc/btengsrvsettingsmgr.h --- a/bluetoothengine/bteng/inc/btengsrvsettingsmgr.h Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/bteng/inc/btengsrvsettingsmgr.h Wed Apr 14 16:09:00 2010 +0300 @@ -247,13 +247,6 @@ void CheckTemporaryPowerStateL( TBTPowerState& aCurrentState, TBTPowerState aNewState, TBool aTemporary ); - /** - * Set the Class of Device. - * - * @since Symbian^3 - */ - void SetClassOfDeviceL(); - private: // data #ifdef __WINS__ diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bteng/src/btengsrvsettingsmgr.cpp --- a/bluetoothengine/bteng/src/btengsrvsettingsmgr.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/bteng/src/btengsrvsettingsmgr.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -31,10 +31,6 @@ #include "btengsrvstate.h" #include "debug.h" -#ifndef SETLOCALNAME -#include -#endif - /** ID of active object helper */ const TInt KBTEngSettingsActive = 30; /** Constant for converting minutes to microseconds */ @@ -45,14 +41,7 @@ const TInt64 KBTEngSspDebugModeTimeout = MAKE_TINT64( 0, 1800000000 ); /** Timeout for turning BT off automatically. The value is 10.5 seconds. */ const TInt KBTEngBtAutoOffTimeout = 10500000; -/** Default values for Major Service Class */ -const TUint16 KCoDDefaultServiceClass = EMajorServiceTelephony | EMajorServiceObjectTransfer | EMajorServiceNetworking; -/** Default values for Major Device Class */ -const TUint8 KCoDDefaultMajorDeviceClass = EMajorDevicePhone; -/** Default values for Minor Device Class */ -const TUint8 KCoDDefaultMinorDeviceClass = EMinorDevicePhoneSmartPhone; - - + // ======== MEMBER FUNCTIONS ======== // --------------------------------------------------------------------------- @@ -668,31 +657,7 @@ // Something went wrong, so we turn BT off again. SetPowerStateL( EBTOff, EFalse ); } - else - { - // Write CoD only when the hardware has fully powered up. - TBTPowerState currState ( EBTOff ); - (void) GetHwPowerState( currState ); - if ( currState == EBTOn ) - { - SetClassOfDeviceL(); -#ifndef SETLOCALNAME - // the macro SETLOCALNAME is used as a workaround to tackle the BT name - // could not be saved to BT chip before chip initialization completed for the first time, - // which is one of the regression after improving the BT boot up time. - // To be removed once the final solution is in place. - CBTEngSettings* settings = CBTEngSettings::NewL(); - TBTDeviceName localName; - localName.Zero(); - TInt err = settings->GetLocalName(localName); - if (err == KErrNone) - { - settings->SetLocalName(localName); - } - delete settings; -#endif - } - } + if ( !iMessage.IsNull()) { iMessage.Complete( aStatus ); @@ -914,30 +879,3 @@ } TRACE_FUNC_EXIT } - - -// --------------------------------------------------------------------------- -// Set the Class of Device. -// --------------------------------------------------------------------------- -// -void CBTEngSrvSettingsMgr::SetClassOfDeviceL() - { - TRACE_FUNC_ENTRY - TUint16 serviceClass = KCoDDefaultServiceClass; - // Check from feature manager if stereo audio is enabled. - FeatureManager::InitializeLibL(); - TBool supported = FeatureManager::FeatureSupported( KFeatureIdBtStereoAudio ); - FeatureManager::UnInitializeLib(); - if( supported ) - { - // A2DP spec says we should set this bit as we are a SRC - serviceClass |= EMajorServiceCapturing; - } - // These values may nayway be overridden by HCI - TBTDeviceClass cod( serviceClass, KCoDDefaultMajorDeviceClass, - KCoDDefaultMinorDeviceClass ); - // Ignore error, it is non-critical - (void) RProperty::Set( KPropertyUidBluetoothControlCategory, - KPropertyKeyBluetoothSetDeviceClass, cod.DeviceClass() ); - TRACE_FUNC_EXIT - } diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bthid/bthidkbdsettings/group/bthidkbdsettings.mmp --- a/bluetoothengine/bthid/bthidkbdsettings/group/bthidkbdsettings.mmp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/bthid/bthidkbdsettings/group/bthidkbdsettings.mmp Wed Apr 14 16:09:00 2010 +0300 @@ -38,6 +38,7 @@ USERINCLUDE ../../common/inc USERINCLUDE ../../manager/inc USERINCLUDE ../../loc +USERINCLUDE ../../../btui/inc SOURCEPATH ../../common/src SOURCE bthidcenrepwatcher.cpp @@ -49,6 +50,9 @@ SOURCE bthidpluginimplementationtable.cpp btkeysettinglist.cpp btkeyenumtextsettingitem.cpp APP_LAYER_SYSTEMINCLUDE +#ifdef __SERIES60_HELP +SYSTEMINCLUDE /epoc32/include/cshelp +#endif SYSTEMINCLUDE ../../../../inc ../../../inc //***********ECOM resource definition****************** diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bthid/bthidkbdsettings/inc/bthidsettingcontainer.h --- a/bluetoothengine/bthid/bthidkbdsettings/inc/bthidsettingcontainer.h Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/bthid/bthidkbdsettings/inc/bthidsettingcontainer.h Wed Apr 14 16:09:00 2010 +0300 @@ -15,7 +15,6 @@ * */ - #ifndef BTHIDSETTINGCONTAINER_H #define BTHIDSETTINGCONTAINER_H @@ -86,7 +85,7 @@ /** * From CCoeControl */ - //void GetHelpContext(TCoeHelpContext& aContext) const; + void GetHelpContext(TCoeHelpContext& aContext) const; private: //data diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bthid/bthidkbdsettings/src/bthidsettingcontainer.cpp --- a/bluetoothengine/bthid/bthidkbdsettings/src/bthidsettingcontainer.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/bthid/bthidkbdsettings/src/bthidsettingcontainer.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -22,6 +22,11 @@ #include //skin #include #include "bthidsettingcontainer.h" +#ifdef __SERIES60_HELP +#include +#include // The bt hrh info is needed, for help launching +#endif +#include "btui.h" #include "debug.h" // ================= MEMBER FUNCTIONS ======================= @@ -162,4 +167,33 @@ return CCoeControl::MopSupplyObject( aId ); } + +#ifdef __SERIES60_HELP + +// --------------------------------------------------------- +// From CCoeControl +// CBTHidSettingContainer::GetHelpContext +// --------------------------------------------------------- +// +void CBTHidSettingContainer::GetHelpContext(TCoeHelpContext& aContext) const + { + TRACE_FUNC_ENTRY + + aContext.iMajor = KBtuiUid3; + aContext.iContext = KBTKEYBOARD_HLP_SETTINGS; + } + +#else + +// --------------------------------------------------------- +// From CCoeControl +// CBTHidSettingContainer::GetHelpContext +// --------------------------------------------------------- +// +void CBTHidSettingContainer::GetHelpContext(TCoeHelpContext& /*aContext*/) const + { + TRACE_FUNC_ENTRY + } + +#endif // End of File diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/bthid/keyboard/src/keyboard.cpp --- a/bluetoothengine/bthid/keyboard/src/keyboard.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/bthid/keyboard/src/keyboard.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -1157,7 +1157,7 @@ #endif //Number entry to Telephone app is handled differently. - if ((IsDigitKey(aScanCode) || IsSpecialHandleKey(aUnicodeKey)) + if ((IsDigitKey(aScanCode) || IsSpecialHandleKey(aUnicodeKey) || aScanCode == EStdKeyBackspace ) && IsPhoneAppTopMost()) return; diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/inc/btnotifuiutil.h --- a/bluetoothengine/btnotif/inc/btnotifuiutil.h Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/inc/btnotifuiutil.h Wed Apr 14 16:09:00 2010 +0300 @@ -21,7 +21,7 @@ #include #include #include -#include +#include // CONSTANTS // Literals for resource and bitmap files ( drive, directory, filename(s) ) diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/BTNAuthNotifier.cpp --- a/bluetoothengine/btnotif/src/BTNAuthNotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/BTNAuthNotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -22,7 +22,7 @@ #include "btNotifDebug.h" // Debugging macros #include #include // Cover UI -#include +#include #include #include #include @@ -156,7 +156,11 @@ User::LeaveIfError( iNotifLockProp.Attach( KPSUidBluetoothEnginePrivateCategory, KBTNotifierLocks ) ); } - iLockActive = CBTNotifActive::NewL( this, KBTNotifAuthNotifierLockReq, CActive::EPriorityStandard ); + + if(!iLockActive) + { + iLockActive = CBTNotifActive::NewL( this, KBTNotifAuthNotifierLockReq, CActive::EPriorityStandard ); + } CheckAndSubscribeNotifLocks(); @@ -289,11 +293,15 @@ { FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::Cancel()")); - iLockActive->CancelRequest(); - delete iLockActive; - iLockActive = NULL; + if (iLockActive) + { + iLockActive->CancelRequest(); + delete iLockActive; + iLockActive = NULL; + } + iNotifLockProp.Close(); - + CBTNotifierBase::Cancel(); FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::Cancel() completed")); @@ -538,6 +546,7 @@ } } + // ---------------------------------------------------------- // CBTAuthNotifier::DoRejectAuthorizationL // Handle query threshold and block after user rejects authorization diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/BTNGenericInfoNotifier.cpp --- a/bluetoothengine/btnotif/src/BTNGenericInfoNotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/BTNGenericInfoNotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -22,7 +22,7 @@ #include // Own resources #include "BTNGenericInfoNotifier.h" // Own class definition #include "btNotifDebug.h" // Debugging macros -#include +#include #include #include #include "btnotifnameutils.h" diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/BTNGenericQueryNotifier.cpp --- a/bluetoothengine/btnotif/src/BTNGenericQueryNotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/BTNGenericQueryNotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include // Localisation stringloader -#include +#include #include #include // Own resources #include diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/BTNObexPinNotifier.cpp --- a/bluetoothengine/btnotif/src/BTNObexPinNotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/BTNObexPinNotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -23,7 +23,7 @@ #include "btnobexpinnotifier.h" // Own class definition #include "btNotifDebug.h" // Debugging macros -#include +#include // ================= MEMBER FUNCTIONS ======================= diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/BTNPBAPPinNotifier.cpp --- a/bluetoothengine/btnotif/src/BTNPBAPPinNotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/BTNPBAPPinNotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -31,7 +31,7 @@ #include "btnpbappinnotifier.h" // own class definition #include "btNotifDebug.h" // debugging macros -#include +#include // ================= MEMBER FUNCTIONS ======================= diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/BTNPinNotifier.cpp --- a/bluetoothengine/btnotif/src/BTNPinNotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/BTNPinNotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -37,7 +37,7 @@ #include #endif -#include +#include #ifdef __SERIES60_HELP #include diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/BTNPwrNotifier.cpp --- a/bluetoothengine/btnotif/src/BTNPwrNotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/BTNPwrNotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -21,7 +21,7 @@ #include "btnpwrnotifier.h" // Own class definition #include "btNotifDebug.h" // Debugging macros #include -#include +#include // ================= MEMBER FUNCTIONS ======================= diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/btnpaireddevsettnotifier.cpp --- a/bluetoothengine/btnotif/src/btnpaireddevsettnotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/btnpaireddevsettnotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -27,7 +27,7 @@ #include #include "btnotifnameutils.h" -#include +#include #include #include // CoverUI diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/btnssppasskeyentrynotifier.cpp --- a/bluetoothengine/btnotif/src/btnssppasskeyentrynotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/btnssppasskeyentrynotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -30,7 +30,7 @@ #include #endif #include // Own resources -#include +#include #include #include "btnotif.hrh" // Own resource header #include "btnssppasskeyentrynotifier.h" // Own class definition diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/btnumcmpnotifier.cpp --- a/bluetoothengine/btnotif/src/btnumcmpnotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/btnumcmpnotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -32,7 +32,7 @@ #include "btNotifDebug.h" // Debugging macros #include #include -#include +#include #include #include "btnotifnameutils.h" diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btnotif/src/btuserconfnotifier.cpp --- a/bluetoothengine/btnotif/src/btuserconfnotifier.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btnotif/src/btuserconfnotifier.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -32,7 +32,7 @@ #include "btNotifDebug.h" // Debugging macros #include #include -#include +#include #include #include "btnotifnameutils.h" diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btui/Ecom/inc/BTUIPairedDevicesView.h --- a/bluetoothengine/btui/Ecom/inc/BTUIPairedDevicesView.h Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btui/Ecom/inc/BTUIPairedDevicesView.h Wed Apr 14 16:09:00 2010 +0300 @@ -29,7 +29,7 @@ #include "BTUIListedDevicesView.h" #include "btuipluginman.h" #include "BTUIActive.h" -#include +#include #include class CAknNavigationControlContainer; diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btui/Ecom/src/BTUIBlockedDevicesView.cpp --- a/bluetoothengine/btui/Ecom/src/BTUIBlockedDevicesView.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btui/Ecom/src/BTUIBlockedDevicesView.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -27,7 +27,7 @@ #include // Series 60 localisation stringloader #include #include // Help launcher -#include +#include #include "BTUIBlockedDevicesView.h" #include "BTUIDeviceContainer.h" diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btui/Ecom/src/BTUIDeviceContainer.cpp --- a/bluetoothengine/btui/Ecom/src/BTUIDeviceContainer.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btui/Ecom/src/BTUIDeviceContainer.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -76,17 +76,7 @@ iDeviceList->SetListBoxObserver( this ); // Set the empty text at basis of the list - HBufC* devEmptyText = NULL ; - if(iGroup ==EGroupPaired) - { - devEmptyText=iCoeEnv->AllocReadResourceLC( R_BT_NO_PAIRED_DEVICES); - } - else - { - devEmptyText=iCoeEnv->AllocReadResourceLC( R_BT_NO_BLOCKED_DEVICES); - } - iDeviceList->View()->SetListEmptyTextL(*devEmptyText ); - CleanupStack::PopAndDestroy(devEmptyText); + iDeviceList->View()->SetListEmptyTextL( KNullDesC ); // Set up filenames for Btui and Avkon bitmaps TFileName bmpFilename; @@ -291,7 +281,21 @@ if(deviceCount >0 ) iDeviceList->SetCurrentItemIndex( Max(selectedItem,0 )) ; - + else + { + HBufC* devEmptyText = NULL; + if(iGroup ==EGroupPaired) + { + devEmptyText=iCoeEnv->AllocReadResourceLC( R_BT_NO_PAIRED_DEVICES); + } + else + { + devEmptyText=iCoeEnv->AllocReadResourceLC( R_BT_NO_BLOCKED_DEVICES); + } + iDeviceList->View()->SetListEmptyTextL(*devEmptyText ); + CleanupStack::PopAndDestroy(devEmptyText); + } + if(addition | removal | previouslySelected!=selectedItem) iDeviceList->DrawDeferred(); TRACE_FUNC_EXIT diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btui/Ecom/src/BTUIMainView.cpp --- a/bluetoothengine/btui/Ecom/src/BTUIMainView.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btui/Ecom/src/BTUIMainView.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -43,7 +43,7 @@ #include // For char filter #include #include // Help launcher -#include +#include #include #include #include diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btui/Ecom/src/BTUIPairedDevicesView.cpp --- a/bluetoothengine/btui/Ecom/src/BTUIPairedDevicesView.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btui/Ecom/src/BTUIPairedDevicesView.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -43,7 +43,7 @@ #include "btui.h" // Global declarations #include "BTUIPairedDevicesView.h" #include "BTUIDeviceContainer.h" -#include +#include #include // Help IDs #include @@ -1232,6 +1232,7 @@ // Showing a note in this case would always show a note with "%U" in it // so the note is not shown at all TRACE_INFO(_L("KErrAlreadyExists, but no device given, not showing a notification")) + CleanupStack::PopAndDestroy(&stringholder); break; } diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btui/Ecom/src/BTUISap.cpp --- a/bluetoothengine/btui/Ecom/src/BTUISap.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btui/Ecom/src/BTUISap.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -25,7 +25,7 @@ #include // for disconnect type and connection observer #include #include -#include +#include #include // For EnterpriseEnablementL() #include #include diff -r b6f55cd40afd -r f7fbeaeb166a bluetoothengine/btui/Ecom/src/BTUIViewsCommonUtils.cpp --- a/bluetoothengine/btui/Ecom/src/BTUIViewsCommonUtils.cpp Wed Mar 31 21:51:05 2010 +0300 +++ b/bluetoothengine/btui/Ecom/src/BTUIViewsCommonUtils.cpp Wed Apr 14 16:09:00 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "BTUIViewsCommonUtils.h" #include "debug.h"