--- a/bluetooth/btstack/secman/pairingserver.h	Thu Aug 19 11:01:00 2010 +0300
+++ b/bluetooth/btstack/secman/pairingserver.h	Tue Aug 31 16:20:16 2010 +0300
@@ -218,8 +218,8 @@
 
 	void Complete(TInt aError);
 
+	static void CleanupStartMessage(TAny* aPtr);
 	static TInt StaticShutdown(TAny* aPtr);
-	TBool ShuttingDown() const;
 
 private: // from CPairingSubSession
 	void DispatchSubSessMessageL(const RMessage2& aMessage);
@@ -246,15 +246,12 @@
 private:
 	enum TState
 		{
-		EMintCondition,
-		EInitiated,
+		EInvalid,
 		EInitialConnectionPending,
 		EInitialConnection,
 		EZombie,
 		EFinalConnectionPending,
 		EFinalConnection,
-		EShutdownRequested,
-		EShutdownPending,
 		EShutdown,
 		};