--- a/phonebookui/phonebookservices/src/cntserviceproviderold.cpp	Wed Aug 11 09:06:35 2010 +0300
+++ b/phonebookui/phonebookservices/src/cntserviceproviderold.cpp	Mon Aug 23 16:06:28 2010 +0300
@@ -136,8 +136,19 @@
     connect(this, SIGNAL(returnValueDelivered()), qApp, SLOT(quit()));
     if ( mCurrentRequestIndex != 0 )
     {
-        CNT_LOG_ARGS("next, completing request.")
-        const bool success = completeRequest(mCurrentRequestIndex, retValue);
+        bool success = false;
+        
+        if (!mOverriddenReturnValue.isNull() && retValue.value<int>() != KCntServicesReturnValueContactDeleted)
+        {
+            CNT_LOG_ARGS(mOverriddenReturnValue.value<int>());
+            success = completeRequest(mCurrentRequestIndex, mOverriddenReturnValue);
+        }
+        else
+        {
+            CNT_LOG_ARGS(retValue.value<int>());
+            success = completeRequest(mCurrentRequestIndex, retValue);
+        }
+        
         if ( !success )
         {
             CNT_LOG_ARGS("Failed to complete highway request.");
@@ -147,4 +158,16 @@
     CNT_EXIT
 }
 
+void CntServiceProviderOld::overrideReturnValue(const QVariant& retValue)
+{
+    CNT_ENTRY
+    
+    if (mOverriddenReturnValue.isNull() || mOverriddenReturnValue.value<int>() != KCntServicesReturnValueContactSaved)
+    {
+        mOverriddenReturnValue = retValue;
+    }
+    
+    CNT_EXIT
+}
+
 // end of file