--- a/harvester/server/inc/harvesterao.h	Tue Jul 06 14:44:37 2010 +0300
+++ b/harvester/server/inc/harvesterao.h	Fri Sep 17 16:54:49 2010 +0300
@@ -22,6 +22,8 @@
 #include <e32base.h>
 #include <badesca.h>
 
+#include <rlocationobjectmanipulator.h>
+
 #include "contextengine.h"
 #include "mdeharvestersession.h"
 
@@ -74,7 +76,8 @@
 		void ConstructL(CMdEObjectDef& aObjectDef);
 
 	public:	
-		static CHarvesterAoPropertyDefs* NewL(CMdEObjectDef& aObjectDef);
+        static CHarvesterAoPropertyDefs* NewL();
+        void SetByObjectDefL( CMdEObjectDef& aObjectDef );
 	};
 
 /**
@@ -555,8 +558,6 @@
         
         CHarvesterAoPropertyDefs* iPropDefs;
         
-        TBool iMassMemoryIdChecked;
-        
         // Own.
         CDesCArray* iCameraExtensionArray;
 
@@ -585,7 +586,11 @@
         HBufC* iMmcSoundsPath;
         
         TBool iUnmountDetected;
+        TBool iUnmountHandlingOngoing;
         TBool iPriorityInterruptDetected;
+        
+        RLocationObjectManipulator iLocManipulator;
+        TBool iLocManipulatorConnected;
 	};
 	
 #endif //__CHARVESTERAO_H__