--- a/camerauis/cameraxui/cxengine/src/cxeimagedataitemsymbian.cpp	Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxengine/src/cxeimagedataitemsymbian.cpp	Thu Jul 15 01:55:05 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -31,11 +31,13 @@
 CxeImageDataItemSymbian::CxeImageDataItemSymbian(QByteArray data,
                                                  QString filename,
                                                  int id,
+                                                 bool addLocation,
                                                  CxeImageDataItem::State state)
   : CxeStateMachine("CxeImageDataItemSymbian"),
     mError(KErrNone),
     mId(id),
     mData(data),
+    mAddLocationInfo(addLocation),
     mPath(filename)
 {
     CX_DEBUG_ENTER_FUNCTION();
@@ -165,6 +167,7 @@
 CxeError::Id CxeImageDataItemSymbian::save()
 {
     CX_DEBUG_ENTER_FUNCTION();
+    OstTrace0(camerax_performance, CXEIMAGEDATAITEMSYMBIAN_SAVE_IN, "msg: e_CX_IMAGEDATAITEM_SAVE 1");
 
     mError = KErrNone;
 
@@ -225,7 +228,7 @@
 
     mFile.Close(); //~400us
     mFs.Close();   //~450us
-    OstTrace0(camerax_performance, CXEIMAGEDATAIMTEMSYMBIAN_SAVED, "msg: e_CX_SHOT_TO_SAVE 0");
+    OstTrace0(camerax_performance, CXEIMAGEDATAITEMSYMBIAN_SAVED, "msg: e_CX_SHOT_TO_SAVE 0");
 
     if (mError == KErrNone) {
         setState(CxeImageDataItem::Saved);
@@ -234,7 +237,7 @@
     }
     emit imageSaved(CxeErrorHandlingSymbian::map(mError), mPath, mId);
 
-    CX_DEBUG(("mError: %d", mError));
+    OstTrace0(camerax_performance, CXEIMAGEDATAITEMSYMBIAN_SAVE_OUT, "msg: e_CX_IMAGEDATAITEM_SAVE 0");
     CX_DEBUG_EXIT_FUNCTION();
     return CxeErrorHandlingSymbian::map(mError);
 }
@@ -327,6 +330,12 @@
     emit stateChanged(static_cast<State> (newStateId), error);
 }
 
+
+bool CxeImageDataItemSymbian::isLocationEnabled() const
+{
+    return mAddLocationInfo;
+}
+
 void CxeImageDataItemSymbian::initializeStates()
 {
     // addState( id, name, allowed next states )