--- a/harvester/client/inc/harvesterclientao.h	Wed Aug 18 10:12:07 2010 +0300
+++ b/harvester/client/inc/harvesterclientao.h	Thu Sep 02 20:52:02 2010 +0300
@@ -25,14 +25,16 @@
 
 #include "harvesterclient.h"
 
+class RHarvesterClient;
+class MHarvestObserver;
+
 NONSHARABLE_CLASS( CHarvesterClientAO ) : public CActive
     {
     public:
         /**
         * Construction.
         */
-        static CHarvesterClientAO* NewL( RHarvesterClient& aHarvesterClient,
-                                                            CHarvesterNotificationQueue* aNotificationQueue );
+        static CHarvesterClientAO* NewL( RHarvesterClient &aHarvesterClient );
 
         /**
         * Destruction.
@@ -44,14 +46,22 @@
         * @param aObserver  Pointer to observer object.
         */
         void SetObserver( MHarvestObserver* aObserver );
+
+        /**
+        * Method for removing an observer.
+        * @param aObserver  Pointer to observer object.
+        */		
+        void RemoveObserver( MHarvestObserver* aObserver );
+        
+        void NotificateObserver( TInt aErr );
         
         /**
          * Set AO to active state. RunL is launched from harvesting complete
          * request which are subscribed from server.
          */ 
-        void Active( TDesC& aUri );
+        void Active();
         
-        TBool RequestComplete();
+        void CancelRequest();
         
     protected:
 		
@@ -80,8 +90,7 @@
         * 
         * @param aHarvesterClient Reference to session class
         */	
-        CHarvesterClientAO( RHarvesterClient& aHarvesterClient,
-                                           CHarvesterNotificationQueue* aNotificationQueue );
+        CHarvesterClientAO( RHarvesterClient &aHarvesterClient );
 
         /**
         * 2nd phase construction
@@ -97,20 +106,15 @@
 
         /**
         * Reference to Harvester client session
-        */      
+        */   	
         RHarvesterClient& iHarvesterClient;
-        
-        /**
-        * Pointer to harvest notification request queue, not owned
-        */   	
-        CHarvesterNotificationQueue* iNotificationQueue;
 
         /**
          * Harvester server assigned file name
          */ 
-        HBufC* iURI;
+        TFileName iURI;
         
-        TBool iRequestComplete;
+        TBool iCancelled;
     };
 
 #endif // __CHARVESTERCLIENTAO_H__