--- a/accessoryservices/accessoryserver/src/Server/AccSrvServerModel.cpp	Wed Aug 18 11:03:14 2010 +0300
+++ b/accessoryservices/accessoryserver/src/Server/AccSrvServerModel.cpp	Thu Sep 02 21:48:26 2010 +0300
@@ -316,7 +316,7 @@
 // CAccSrvServerModel::RemovePhysicalConnectionL
 // -----------------------------------------------------------------------------
 //
-void CAccSrvServerModel::RemovePhysicalConnection( const TAccPolGenericID& aGenericID )
+TInt CAccSrvServerModel::RemovePhysicalConnection( const TAccPolGenericID& aGenericID )
     {
     COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection()" );
 
@@ -329,7 +329,9 @@
         iPhysicalConnectionArray.Remove( index );
         }
 
-    COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection - return void" );
+    COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::RemovePhysicalConnection - return %d", index );
+
+	return index;
     }
 
 // -----------------------------------------------------------------------------
@@ -754,17 +756,17 @@
     }
 
 // -----------------------------------------------------------------------------
-// CAccSrvServerModel::AddASYThreadId
+// CAccSrvServerModel::AddASYThreadIdL
 // -----------------------------------------------------------------------------
 //
-void CAccSrvServerModel::AddASYThreadId( TUint aThreadID )
+void CAccSrvServerModel::AddASYThreadIdL( TUint aThreadID )
     {
-    COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::AddASYThreadId(%d)", aThreadID );
-    iRegisteredASYs.Append( aThreadID );
+    COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::AddASYThreadIdL(%d)", aThreadID );
+    iRegisteredASYs.AppendL( aThreadID );
     }
 
 // -----------------------------------------------------------------------------
-// CAccSrvServerModel::StoreASYThreadID
+// CAccSrvServerModel::StoreASYThreadIDL
 //
 // If aThreadID can be found from connected ASYs table (iRegisteredASYs),
 // mapping between aUniqueID and aThreadID can be made.
@@ -772,17 +774,17 @@
 // all request for that gineric ID.
 // -----------------------------------------------------------------------------
 //
-void CAccSrvServerModel::StoreASYThreadID( TUint aThreadID, TInt aUniqueID )
+void CAccSrvServerModel::StoreASYThreadIDL( TUint aThreadID, TInt aUniqueID )
     {
-    COM_TRACE_2( "[AccFW:AccServer] CAccSrvServerModel::StoreASYThreadID(%d %d)", aThreadID, aUniqueID );
+    COM_TRACE_2( "[AccFW:AccServer] CAccSrvServerModel::StoreASYThreadIDL(%d %d)", aThreadID, aUniqueID );
     if ( KErrNotFound == iRegisteredASYs.Find( aThreadID ) )
         {
-        COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::StoreASYThreadID - Thread ID is not ASYs" );
+        COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::StoreASYThreadIDL - Thread ID is not ASYs" );
         }
     else
         {
-        iASYThreadID.Append( aThreadID );
-        iASYUniqueID.Append( aUniqueID );
+        iASYThreadID.AppendL( aThreadID );
+        iASYUniqueID.AppendL( aUniqueID );
         }
     }
 
@@ -795,7 +797,7 @@
     COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::RemoveASYThreadID(%d)", aUniqueID );
     TInt index( iASYUniqueID.Find( aUniqueID ) );
 
-    //If index is KErrNotFound, threadIDs are never stored in CAccSrvServerModel::StoreASYThreadID()
+    //If index is KErrNotFound, threadIDs are never stored in CAccSrvServerModel::StoreASYThreadIDL()
     if ( KErrNotFound != index )
         {
         iASYThreadID.Remove( index );
@@ -833,20 +835,20 @@
     }
 
 // -----------------------------------------------------------------------------
-// CAccSrvServerModel::SetMsgThreadIDFilter
+// CAccSrvServerModel::SetMsgThreadIDFilterL
 // -----------------------------------------------------------------------------
 //
-void CAccSrvServerModel::SetMsgThreadIDFilter( TUint aThreadID, TMsgID aMsgID )
+void CAccSrvServerModel::SetMsgThreadIDFilterL( TUint aThreadID, TMsgID aMsgID )
     {
-    COM_TRACE_2( "[AccFW:AccServer] CAccSrvServerModel::SetMsgThreadIDFilter(%d %d)", aThreadID, aMsgID );
+    COM_TRACE_2( "[AccFW:AccServer] CAccSrvServerModel::SetMsgThreadIDFilterL(%d %d)", aThreadID, aMsgID );
 
     TAccSrvThreadIDFilter threadIDFilter;
     threadIDFilter.iThreadID = aThreadID;
     threadIDFilter.iMsgID = aMsgID;
 
-    iThreadIDFilterArray.Append( threadIDFilter );
+    iThreadIDFilterArray.AppendL( threadIDFilter );
 
-    COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::SetMsgThreadIDFilter - count=%d - return void", iThreadIDFilterArray.Count() );
+    COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::SetMsgThreadIDFilterL - count=%d - return void", iThreadIDFilterArray.Count() );
     }
 
 // -----------------------------------------------------------------------------
@@ -898,7 +900,7 @@
     else
         {
         COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::SetCancelledConnectAccessoryL - handling index %d", index );
-        iCancelledConnectAccessory.Append( genericIDArray.GetGenericIDL( index ).UniqueID() );
+        iCancelledConnectAccessory.AppendL( genericIDArray.GetGenericIDL( index ).UniqueID() );
         }
 
     COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::SetCancelledConnectAccessoryL - return void" );
@@ -929,7 +931,7 @@
     else
         {
         COM_TRACE_1( "[AccFW:AccServer] CAccSrvServerModel::SetCancelledConnectAccessoryL - handling index %d", index );
-        iCancelledConnectAccessory.Append( genericIDArray.GetGenericIDL( index ).UniqueID() );
+        iCancelledConnectAccessory.AppendL( genericIDArray.GetGenericIDL( index ).UniqueID() );
         }
 
     COM_TRACE_( "[AccFW:AccServer] CAccSrvServerModel::SetCancelledConnectAccessoryL - DeviceAddress - return void" );