--- a/harvester/composerplugins/imagecomposer/src/imagecomposerao.cpp	Wed Sep 15 12:40:59 2010 +0300
+++ b/harvester/composerplugins/imagecomposer/src/imagecomposerao.cpp	Wed Oct 13 15:02:02 2010 +0300
@@ -71,20 +71,16 @@
     if ( iMdeObject )
         {
         delete iMdeObject;
-        iMdeObject = NULL;
         }
     if ( iExifUtil )
     	{
     	delete iExifUtil;
-    	iExifUtil = NULL;
     	}
 
     delete iRelationQuery;
-    iRelationQuery = NULL;
     iFs.Close();
     
     delete iMdEHarvesterSession;
-    iMdEHarvesterSession = NULL;
     }
 
 // ---------------------------------------------------------------------------
@@ -114,7 +110,6 @@
     CActiveScheduler::Add( this );
     
     iExifUtil = CHarvesterExifUtil::NewL();
-    iFastModeEnabled = EFalse;
     User::LeaveIfError( iFs.Connect() );
     }
     
@@ -246,10 +241,6 @@
             if( iItemQueue.Count() <= 0 )
             	{
                 iItemQueue.Compress();
-                if( iFastModeEnabled )
-                    {
-                    SetPriority( KHarvesterPriorityComposerPlugin );
-                    }
             	SetNextRequest( ERequestReady );
             	}
             else
@@ -259,23 +250,9 @@
 	            
 	            if ( err == KErrNone )
 	                {    
-	                CMdEProperty* prop = NULL;
-	                CMdEPropertyDef& originPropDef = iMdeObject->Def().GetPropertyDefL( Object::KOriginProperty );
-	                iMdeObject->Property( originPropDef, prop );
-	                if( prop && prop->Uint8ValueL() == MdeConstants::Object::ECamera && !iFastModeEnabled )
-	                    {
-	                    iFastModeEnabled = ETrue;
-	                    SetPriority( KHarvesterPriorityMonitorPlugin );
-	                    }
-	                else if( iFastModeEnabled )
-	                    {
-	                    iFastModeEnabled = EFalse;
-	                    SetPriority( KHarvesterPriorityComposerPlugin );
-	                    }
-	                
 	                SetNextRequest( ERequestCompose );
 	                }
-	            // if object does not exists, or data is not modified, find next
+	            // if object does not exists, find next
 	            else if ( err == KErrNotFound || err == KErrAbort )
 	                 {
 	                 if ( err == KErrAbort && mdeObjectId != KNoId )
@@ -423,7 +400,6 @@
 	
 	    	if( error != KErrNone || entry.iModified == time )
 	    		{
-	    	    WRITELOG( "CImageComposerAO::GetObjectFromMdeL() - image data has not been modified - abort" );
 	    		User::Leave( KErrAbort );
 	    		}
 	    	}
@@ -770,13 +746,8 @@
 
     // Check whether the file is open
     TBool isOpen( EFalse );
-    const TInt openError = iFs.IsFileOpen( uri, isOpen );
-    if( openError != KErrNone )
-        {
-        WRITELOG( "CImageComposerAO::DoWriteExifL() - check for open file failed!" );
-        User::Leave( openError );
-        }
-    else if ( isOpen )
+    iFs.IsFileOpen( uri, isOpen );
+    if ( isOpen )
         {
         WRITELOG( "CImageComposerAO::DoWriteExifL() - file handle is open!" );
         User::Leave( KErrInUse );