Revision: 201013 RCL_3
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Wed, 14 Apr 2010 16:09:00 +0300
branchRCL_3
changeset 11 f7fbeaeb166a
parent 10 b6f55cd40afd
child 12 b23265fb36da
Revision: 201013 Kit: 201015
bluetoothengine/bteng/btrfsplugin/src/btrfsplugin.cpp
bluetoothengine/bteng/conf/bteng.confml
bluetoothengine/bteng/conf/bteng_10204DAC.crml
bluetoothengine/bteng/data/btrfs.txt
bluetoothengine/bteng/group/bld.inf
bluetoothengine/bteng/group/bteng.mmp
bluetoothengine/bteng/inc/btengsrvsettingsmgr.h
bluetoothengine/bteng/src/btengsrvsettingsmgr.cpp
bluetoothengine/bthid/bthidkbdsettings/group/bthidkbdsettings.mmp
bluetoothengine/bthid/bthidkbdsettings/inc/bthidsettingcontainer.h
bluetoothengine/bthid/bthidkbdsettings/src/bthidsettingcontainer.cpp
bluetoothengine/bthid/keyboard/src/keyboard.cpp
bluetoothengine/btnotif/inc/btnotifuiutil.h
bluetoothengine/btnotif/src/BTNAuthNotifier.cpp
bluetoothengine/btnotif/src/BTNGenericInfoNotifier.cpp
bluetoothengine/btnotif/src/BTNGenericQueryNotifier.cpp
bluetoothengine/btnotif/src/BTNObexPinNotifier.cpp
bluetoothengine/btnotif/src/BTNPBAPPinNotifier.cpp
bluetoothengine/btnotif/src/BTNPinNotifier.cpp
bluetoothengine/btnotif/src/BTNPwrNotifier.cpp
bluetoothengine/btnotif/src/btnpaireddevsettnotifier.cpp
bluetoothengine/btnotif/src/btnssppasskeyentrynotifier.cpp
bluetoothengine/btnotif/src/btnumcmpnotifier.cpp
bluetoothengine/btnotif/src/btuserconfnotifier.cpp
bluetoothengine/btui/Ecom/inc/BTUIPairedDevicesView.h
bluetoothengine/btui/Ecom/src/BTUIBlockedDevicesView.cpp
bluetoothengine/btui/Ecom/src/BTUIDeviceContainer.cpp
bluetoothengine/btui/Ecom/src/BTUIMainView.cpp
bluetoothengine/btui/Ecom/src/BTUIPairedDevicesView.cpp
bluetoothengine/btui/Ecom/src/BTUISap.cpp
bluetoothengine/btui/Ecom/src/BTUIViewsCommonUtils.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
     }
 
Binary file bluetoothengine/bteng/conf/bteng.confml has changed
Binary file bluetoothengine/bteng/conf/bteng_10204DAC.crml has changed
Binary file bluetoothengine/bteng/data/btrfs.txt has changed
--- 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
--- 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
--- 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__
--- 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 <btengsettings.h>
-#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
-    }
--- 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******************
--- 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
--- 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 <AknsBasicBackgroundControlContext.h> //skin
 #include <BthidResource.rsg>
 #include "bthidsettingcontainer.h"
+#ifdef __SERIES60_HELP
+#include <hlplch.h>
+#include <csxhelp/bt.hlp.hrh> // 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
--- 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;
 
--- 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 <data_caging_path_literals.hrh> 
 #include <AknQueryDialog.h>
 #include <AknWaitDialog.h>
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 
 // CONSTANTS
 // Literals for resource and bitmap files ( drive, directory, filename(s) )
--- 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 <btextnotifiers.h>
 #include <AknMediatorFacade.h> // Cover UI
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 #include <btengconstants.h>
 #include <btengsettings.h>
 #include <e32cmn.h>
@@ -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
--- 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 <BTNotif.rsg>          // Own resources
 #include "BTNGenericInfoNotifier.h"      // Own class definition
 #include "btNotifDebug.h"       // Debugging macros
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 #include <e32cmn.h>
 #include <bluetoothuiutil.h>
 #include "btnotifnameutils.h"
--- 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 <StringLoader.h>       // Localisation stringloader
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 #include <e32cmn.h>
 #include <BTNotif.rsg>          // Own resources
 #include <btengsettings.h>
--- 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 <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 
 // ================= MEMBER FUNCTIONS =======================
 
--- 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 <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 
 // ================= MEMBER FUNCTIONS =======================
 
--- 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 <btextnotifierspartner.h>
 #endif
 
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 
 #ifdef __SERIES60_HELP
 #include <hlplch.h>
--- 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 <bt_subscribe.h>
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 
 
 // ================= MEMBER FUNCTIONS =======================
--- 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 <bluetooth/hci/hcierrors.h>
 #include "btnotifnameutils.h"
 
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 
 #include <e32cmn.h>
 #include <AknMediatorFacade.h>  // CoverUI 
--- 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 <btextnotifierspartner.h>
 #endif
 #include <BTNotif.rsg>       // Own resources
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 #include <bluetoothuiutil.h>
 #include "btnotif.hrh"       // Own resource header
 #include "btnssppasskeyentrynotifier.h"  // Own class definition
--- 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 <btotgpairpub.inl>
 #include <btengconnman.h>
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 #include <bluetoothuiutil.h>
 #include "btnotifnameutils.h"
 
--- 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 <btotgpairpub.inl>
 #include <btengconnman.h>
-#include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h>
+#include <secondarydisplay/BTnotifSecondaryDisplayAPI.h>
 #include <bluetoothuiutil.h>
 #include "btnotifnameutils.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 <SecondaryDisplay/BtuiSecondaryDisplayAPI.h>
+#include <secondarydisplay/BtuiSecondaryDisplayAPI.h>
 #include <gstabbedview.h>
 
 class CAknNavigationControlContainer;
--- 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 <StringLoader.h>   // Series 60 localisation stringloader
 #include <aknnavi.h>
 #include <hlplch.h>         // Help launcher
-#include <SecondaryDisplay/BtuiSecondaryDisplayAPI.h>
+#include <secondarydisplay/BtuiSecondaryDisplayAPI.h>
 
 #include "BTUIBlockedDevicesView.h"
 #include "BTUIDeviceContainer.h"
--- 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
--- 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 <AknUtils.h>					// For char filter
 #include <CoreApplicationUIsSDKCRKeys.h>
 #include <hlplch.h>         			// Help launcher
-#include <SecondaryDisplay/BtuiSecondaryDisplayAPI.h>
+#include <secondarydisplay/BtuiSecondaryDisplayAPI.h>
 #include <btengprivatecrkeys.h>
 #include <gstabhelper.h>
 #include <gsfwviewuids.h>
--- 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 <SecondaryDisplay/BtuiSecondaryDisplayAPI.h>
+#include <secondarydisplay/BtuiSecondaryDisplayAPI.h>
 #include <csxhelp/bt.hlp.hrh>   // Help IDs
 
 #include <gstabhelper.h>
@@ -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;	
           		}
 
--- 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 <btengconnman.h>       // for disconnect type and connection observer
 #include <btengsettings.h>
 #include <btengdevman.h>
-#include <SecondaryDisplay/BtuiSecondaryDisplayAPI.h>
+#include <secondarydisplay/BtuiSecondaryDisplayAPI.h>
 #include <btfeaturescfg.h>					// For EnterpriseEnablementL()
 #include <btnotif.h>
 #include <utf.h>
--- 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 <btengsettings.h>
 #include <ctsydomainpskeys.h>
 #include <CoreApplicationUIsSDKCRKeys.h>
-#include <SecondaryDisplay/BtuiSecondaryDisplayAPI.h>
+#include <secondarydisplay/BtuiSecondaryDisplayAPI.h>
 
 #include "BTUIViewsCommonUtils.h"
 #include "debug.h"