--- a/bluetoothengine/bteng/inc/btengsrvsession.h Fri Feb 19 22:59:18 2010 +0200
+++ b/bluetoothengine/bteng/inc/btengsrvsession.h Fri Mar 12 15:43:23 2010 +0200
@@ -73,12 +73,6 @@
TBTEngConnectionStatus aConnStatus,
RBTDevAddrArray* aArray, TInt aErr );
- /**
- * Completes client's pairing request.
- * @param aResult the resultof pairing the client will receive.
- */
- TInt CompletePairRequest( TInt aResult );
-
private: // from base class CSession2
/**
@@ -131,22 +125,22 @@
void DispatchMessageL( const RMessage2& aMessage );
/**
- * Cancels outstanding pairing request.
+ * Cancels outstanding request.
*/
- void CancelPairRequest();
-
+ void CancelRequest();
+
+ /**
+ * Checks if power is on, and leaves with error KErrNotReady if not.
+ */
+ void CheckPowerOnL();
+
private: // data
+
/**
* Client-server message containing the thread handle of the client.
* For connection notifications.
*/
RMessage2 iNotifyConnMessage;
-
- /**
- * For connection notifications.
- * For outgoing pairing request.
- */
- RMessage2 iPairMessage;
/**
* Flag indicating if this client requested BT to be switched on temporarily.