bluetoothengine/btui/devmodel/src/btpairedmodel.cpp
branchRCL_3
changeset 9 a42ed326b458
parent 0 f63038272f30
--- a/bluetoothengine/btui/devmodel/src/btpairedmodel.cpp	Fri Mar 12 15:43:23 2010 +0200
+++ b/bluetoothengine/btui/devmodel/src/btpairedmodel.cpp	Mon Mar 15 12:41:15 2010 +0200
@@ -419,12 +419,35 @@
             if(di >=0 )
             	{
             	nameArray.Append(&iDeviceArray[di]->iName);
-            	}            	
+            	}
             }
-        if(iObserver )
-        	{
-    		iObserver->NotifyChangeDeviceComplete(aErr, connectedDevice, &nameArray);        	
-        	}            
+
+        // we will unset the connect status of the device if connection failed &
+            // it is found in paired devices.
+        if( index >= 0 )
+            {
+            // add EStatusBtuiConnected status if the device has a profile connection
+            TBTEngConnectionStatus connStatus;
+            iConnMan->IsConnected(connectedDevice.iAddr, connStatus);
+   
+            if (connStatus != EBTEngConnecting && connStatus != EBTEngConnected)
+                {
+                TRACE_INFO(_L("Unset EStatusBtuiConnected"))
+                UnsetStatusFlags(iDeviceArray[index]->iStatus,EStatusBtuiConnected );
+                }
+            }
+        
+        if(iObserver)
+            {
+            //Show only phone issued request complete notes
+            //Do not show notes for device issued request when BTUI is active
+            if ( requestIssuedFromPhone ) 
+                {
+                iObserver->NotifyChangeDeviceComplete(aErr, connectedDevice, &nameArray);
+                }
+               
+            SendRefreshIfNoError(aErr);
+            }
         nameArray.Reset();
         }
     else