# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1286969607 -10800
# Node ID 01e4abc4f07ed9ac92a1e6280fe4336819c92301
# Parent  bf318c0ae8c0fe6828e9661747b90af8051f2468
Revision: 201039
Kit: 201041

diff -r bf318c0ae8c0 -r 01e4abc4f07e speechsrv_plat/vas_api/inc/vascvpbkhandler.h
--- a/speechsrv_plat/vas_api/inc/vascvpbkhandler.h	Tue Sep 14 21:21:09 2010 +0300
+++ b/speechsrv_plat/vas_api/inc/vascvpbkhandler.h	Wed Oct 13 14:33:27 2010 +0300
@@ -24,14 +24,14 @@
 
 #include <cntdef.h> 
 
-#include <VPbkFieldType.hrh>
+#include <vpbkfieldtype.hrh>
 
-#include <MVPbkContactStoreListObserver.h>
-#include <MVPbkSingleContactOperationObserver.h>
-#include <MVPbkContactObserver.h>
-#include <MVPbkContactAttributeManager.h>
-#include <MVPbkBatchOperationObserver.h> 
-#include <MVPbkContactViewObserver.h> 
+#include <mvpbkcontactstorelistobserver.h>
+#include <mvpbksinglecontactoperationobserver.h>
+#include <mvpbkcontactobserver.h>
+#include <mvpbkcontactattributemanager.h>
+#include <mvpbkbatchoperationobserver.h> 
+#include <mvpbkcontactviewobserver.h> 
 
 #include <vasmbasepbkhandler.h>
 #include <vasmcontactobserver.h>
diff -r bf318c0ae8c0 -r 01e4abc4f07e srsf/nssvascontacthdlr/src/nssvasccontacthandlerimpl.cpp
--- a/srsf/nssvascontacthdlr/src/nssvasccontacthandlerimpl.cpp	Tue Sep 14 21:21:09 2010 +0300
+++ b/srsf/nssvascontacthdlr/src/nssvasccontacthandlerimpl.cpp	Wed Oct 13 14:33:27 2010 +0300
@@ -1522,25 +1522,16 @@
             }
         }
         
-//    TRAPD( err, // trapping is a fix to make the function non-leaving
+    TRAPD( err, // trapping is a fix to make the function non-leaving
 
 	    // Add the tags to the to-be-deleted list.
 	    // (there are 1 or 2 tags in aTagList depending on
 	    //  whether nickname is also there or not)
-	    TRAPD(err,
-		for ( TInt k( 0 ); k < aTagList->Count(); k++ )
+	    for ( TInt k( 0 ); k < aTagList->Count(); k++ )
 	        {
 	        iDeleteTagListArray->AppendL( (*aTagList)[k] );
 	        }
-			);
-		if ( err != KErrNone )
-			{
-			// Destroy tag list
-	    	aTagList->Reset();
-	    	delete aTagList;
-	    	aTagList = 0;
-	        return;
-			}
+
 	    // We have processed this ID
 	    RUBY_DEBUG1( "CNssContactHandlerImplementation::DoRemoveNamesAfterGetTagList Before removal. iDelList.Count [%d]", iDelList.Count() );
 	    if( iDelList.Count() > 0 ) 
@@ -1580,11 +1571,11 @@
 	        RUBY_DEBUG0( "DoRemoveNamesAfterGetTagList Moving to the next phase" );
 	        DoRemoveNamesCallDeleteTag();
 	        }
-//        );  // TRAPD
-//        if( err != KErrNone ) 
-//        	{
-//        	RUBY_ERROR1( "CNssContactHandlerImplementation::DoRemoveNamesAfterGetTagList Leaves with [%d] inside", err );
-//        	}
+        );  // TRAPD
+        if( err != KErrNone ) 
+        	{
+        	RUBY_ERROR1( "CNssContactHandlerImplementation::DoRemoveNamesAfterGetTagList Leaves with [%d] inside", err );
+        	}
 		// Destroy tag list
 	    aTagList->Reset();
 	    delete aTagList;
@@ -1923,23 +1914,7 @@
                             CleanupStack::PushL( extIds );
 
                             extIds->AppendL( iContactQueue[k].iID ); 
-                            if ( iExtensionList[i].iCommand == EMessageCommand ||
-                                  iExtensionList[i].iCommand == EVideoCommand )
-                                {
-                                TInt id = iPbkHandler->FieldIdL();
-                                if ( id )
-                                    {
-                                    extIds->AppendL( id );
-                                    }
-                                else
-                                    {
-                                    extIds->AppendL( fieldId );
-                                    }
-                                }
-                            else
-                                {
-                                extIds->AppendL( fieldId );
-                                }
+                            extIds->AppendL( fieldId ); 
                             extIds->AppendL( action );
                             extIds->AppendL( iContactQueue[k].iType );
                             extIds->AppendL( iExtensionList[i].iCommand );
diff -r bf318c0ae8c0 -r 01e4abc4f07e voiceui/pbkinfoviewimpl/src/pbkinfoviewsindhandler.cpp
--- a/voiceui/pbkinfoviewimpl/src/pbkinfoviewsindhandler.cpp	Tue Sep 14 21:21:09 2010 +0300
+++ b/voiceui/pbkinfoviewimpl/src/pbkinfoviewsindhandler.cpp	Wed Oct 13 14:33:27 2010 +0300
@@ -356,17 +356,9 @@
     HBufC* contact = NULL;
     HBufC* type = NULL;
     TRAPD( err, contact = iTagArray[aIndex]->SpeechItem()->PartialTextL( KNameTrainingIndex ) );
-    if ( err != KErrNone && err != KErrNotFound) 
-        {
-        User::Leave( err );
-        }
-    CleanupStack::PushL( contact );
-    TRAPD( err2, type = iTagArray[aIndex]->SpeechItem()->PartialTextL( KExtensionTrainingIndex ) );
-    if ( err2 != KErrNone && err2 != KErrNotFound) 
-        {
-        User::Leave( err2 );
-        }
-    CleanupStack::PushL( type );
+    if ( err != KErrNone && err != KErrNotFound) User::Leave( err ); 
+    TRAPD( err2, iTagArray[aIndex]->SpeechItem()->PartialTextL( KExtensionTrainingIndex ) );
+    if ( err2 != KErrNone && err2 != KErrNotFound) User::Leave( err2 );
 
     // fetch whole tts string 
     const TDesC& text = iTagArray[aIndex]->SpeechItem()->Text();
@@ -449,7 +441,6 @@
         // if there is only one part (contact), play normally
         iTagArray[aIndex]->SpeechItem()->PlayL( this );
         }
-    CleanupStack::PopAndDestroy( 2,contact );
     }
     
 // ----------------------------------------------------------------------------
diff -r bf318c0ae8c0 -r 01e4abc4f07e voiceui/vcommand/data/vcommand.rss
--- a/voiceui/vcommand/data/vcommand.rss	Tue Sep 14 21:21:09 2010 +0300
+++ b/voiceui/vcommand/data/vcommand.rss	Wed Oct 13 14:33:27 2010 +0300
@@ -770,9 +770,8 @@
 //
 //-----------------------------------------------------------------------------
 //
-RESOURCE SLIDER_WITH_FEEDBACK_STYLE  r_vc_setting_rejection_control 
+RESOURCE SLIDER r_vc_setting_rejection_control 
     {
-    feedbackstyle = EAknSliderFbDynamic;
     layout = EAknSettingsItemSliderLayout;
     minvalue = 0;
     maxvalue = 10;
diff -r bf318c0ae8c0 -r 01e4abc4f07e voiceui/voiceuivoicerecognition/src/vuictutorial.cpp
--- a/voiceui/voiceuivoicerecognition/src/vuictutorial.cpp	Tue Sep 14 21:21:09 2010 +0300
+++ b/voiceui/voiceuivoicerecognition/src/vuictutorial.cpp	Wed Oct 13 14:33:27 2010 +0300
@@ -22,8 +22,6 @@
 #include <avkon.hrh>
 #include <centralrepository.h>
 #include <vcommanddomaincrkeys.h>
-#include <e32property.h>
-#include <ScreensaverInternalPSKeys.h>
 
 #include <vuivoicerecognition.rsg>
 
@@ -343,12 +341,6 @@
                                      iTutorialMode ) );
 
     CleanupStack::PopAndDestroy( client );
-    
-    if ( iTutorialMode )
-        {
-        //Allow screensaver if in tutorial mode
-        RProperty::Set( KPSUidScreenSaver, KScreenSaverAllowScreenSaver, 0 );
-        }
     }
 
 // ---------------------------------------------------------------------------