diff -r ccb4f6b3db21 -r 8cb079868133 accessoryservices/accessoryserver/inc/Server/AccSrvConnectionController.h --- a/accessoryservices/accessoryserver/inc/Server/AccSrvConnectionController.h Tue Aug 31 16:29:05 2010 +0300 +++ b/accessoryservices/accessoryserver/inc/Server/AccSrvConnectionController.h Wed Sep 01 12:34:26 2010 +0100 @@ -176,7 +176,8 @@ * @lib AccServer.lib * @since S60 3.1 */ -NONSHARABLE_CLASS( CAccSrvConnectionController ) : public MAccSrvConnectionControllerObserver +NONSHARABLE_CLASS( CAccSrvConnectionController ) : public CActive, + public MAccSrvConnectionControllerObserver { public :// Constructors and destructor @@ -296,13 +297,7 @@ TAccPolGenericID& aOldGenericId, const CAccSrvConnectionHandler* aCaller, TInt aError ); - - - void HandleConnectionUpdateValidationL( const TAccPolGenericID& aGenericID, - TAccPolGenericID& aOldGenericId, - const CAccSrvSettingsHandler* aCaller, - TInt aError ); - + /** * From MAccSrvConnectionControllerObserver @@ -340,6 +335,12 @@ void SetDefaultAccessoryInformation( const TAccPolGenericID& aGenericID, const TUint32 aDefaultValue); + /** + * From CActive + */ + void RunL(); + void DoCancel(); + protected: // New functions protected: // Functions from base classes @@ -384,8 +385,19 @@ TUint32 iInformationNoteUID; TUint32 iInformationNoteDefault; + // Indicates should accfw show notes about connected accessory. This is + // set to ETrue when accessory is connected and EFalse after note is shown. + // The reason for this is to prevent multiple notes one after another + TBool iShowNotes; CAccSrvWiredConnectionPublisher* iWiredConnPublisher; // Owned + // Ui notifier + RNotifier iNotifier; + + // Response data from notifier + TInt iReplyValue; + TPckg iReplyPck; + public: // Friend classes protected: // Friend classes