--- a/bluetoothengine/btnotif/btnotifsrv/inc/btnotifdeviceselector.h	Wed May 05 09:56:48 2010 +0300
+++ b/bluetoothengine/btnotif/btnotifsrv/inc/btnotifdeviceselector.h	Mon May 17 11:06:23 2010 +0300
@@ -29,6 +29,7 @@
 #include <btengsettings.h>
 #include <btservices/devdiscoveryobserver.h>
 #include "bluetoothnotification.h"
+#include <btservices/btdevrepository.h>
 
 class CBTNotifServer;
 class CAdvanceDevDiscoverer;
@@ -48,7 +49,8 @@
 NONSHARABLE_CLASS( CBTNotifDeviceSelector ) : 
         public CBase,
         public MBTNotificationResult,
-        public MDevDiscoveryObserver
+        public MDevDiscoveryObserver,
+        public MBtDevRepositoryObserver
     {
 
 public:
@@ -127,6 +129,21 @@
      */
     virtual void HandleDiscoveryCompleted( TInt aErr );
     
+    
+    // From MBtDeviceRepositoryObserver
+    
+    void RepositoryInitialized();
+    
+    void DeletedFromRegistry( const TBTDevAddr& addr );
+    
+    void AddedToRegistry( const CBtDevExtension& dev );
+    
+    void ChangedInRegistry( const CBtDevExtension& dev, TUint similarity  ); 
+
+    void ServiceConnectionChanged(
+            const CBtDevExtension& dev, TBool connected );
+
+    
 private:
 
     CBTNotifDeviceSelector( CBTNotifServer& aServer );
@@ -136,6 +153,8 @@
     void PrepareNotificationL( 
             TBluetoothDialogParams::TBTDialogType aType,
             TBTDialogResourceId aResourceId );
+			
+	void LoadUsedDevicesL();		
     
 private: // data    
 
@@ -166,6 +185,10 @@
      */
     RMessage2 iMessage;
     
+    TBool iRepositoryInitialized;
+    
+    TBool iLoadDevices;
+    
     };
 
 #endif // BTNOTIFDEVICESELECTOR_H