--- a/accessoryservices/accessoryserver/inc/Server/AccSrvConnectionController.h	Thu Aug 19 11:09:10 2010 +0300
+++ b/accessoryservices/accessoryserver/inc/Server/AccSrvConnectionController.h	Tue Aug 31 16:29:05 2010 +0300
@@ -176,8 +176,7 @@
 *  @lib AccServer.lib
 *  @since S60 3.1
 */
-NONSHARABLE_CLASS( CAccSrvConnectionController ) : public CActive,
-                                                   public MAccSrvConnectionControllerObserver
+NONSHARABLE_CLASS( CAccSrvConnectionController ) : public MAccSrvConnectionControllerObserver
     {
     public  :// Constructors and destructor
 
@@ -297,7 +296,13 @@
 												TAccPolGenericID& aOldGenericId,
 												const CAccSrvConnectionHandler* aCaller, 
 												TInt aError  );
-        
+		
+
+		void HandleConnectionUpdateValidationL( const TAccPolGenericID& aGenericID, 
+                                                TAccPolGenericID& aOldGenericId,
+		                                        const CAccSrvSettingsHandler* aCaller, 
+		                                        TInt aError  );
+       
         
         /**
         * From MAccSrvConnectionControllerObserver
@@ -335,12 +340,6 @@
 		void SetDefaultAccessoryInformation( const TAccPolGenericID& aGenericID, 
 													 const TUint32 aDefaultValue);
 
-        /**
-        * From CActive
-        */
-        void RunL();
-        void DoCancel();
-
     protected:  // New functions
 
     protected:  // Functions from base classes
@@ -385,19 +384,8 @@
 	    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<TInt> iReplyPck;
-	
     public:     // Friend classes
 
     protected:  // Friend classes