--- a/vtuis/videotelui/src/CVtUiAppUi.cpp	Wed Sep 15 12:15:42 2010 +0300
+++ b/vtuis/videotelui/src/CVtUiAppUi.cpp	Wed Oct 13 14:34:55 2010 +0300
@@ -1008,9 +1008,6 @@
     FeatureManager::UnInitializeLib();
     __VTPRINTEXIT( "VtUi.~" )
     VTLOGUNINIT
-    
-	// Directly exit with all allocated resources cleaned
-    User::Exit( EEikCmdExit );
     }
 
 // -----------------------------------------------------------
@@ -5068,7 +5065,7 @@
     UpdateRenderingParametersL();
     // Notify engine about layout change
     iLayoutChg = ETrue;
-    if( iDisableVideoOngoing || iShareImageOngoing )
+    if( iDisableVideoOngoing )
         {
         error = KErrNotReady;
         }
@@ -5103,7 +5100,6 @@
                 pendingCommand  == KVtEngSetSource ||
                 pendingCommand  == KVtEngPrepareCamera ||
                 pendingCommand  == KVtEngUnfreeze ||
-                pendingCommand  == KVtEngStopShareImage ||
                 invalidCommand  == KVtEngHandleLayoutChange )
             {
             iPendingCmd = pendingCommand;
@@ -5114,11 +5110,6 @@
             iPendingCmd = KVtEngSetSource;
             iUiStates->SetLayoutChangeNeeded( ETrue );
             }
-        if( iShareImageOngoing && pendingCommand == KVtEngCommandNone )
-            {
-            iPendingCmd = KVtEngStartShareImage;
-            iUiStates->SetLayoutChangeNeeded( ETrue );
-            }
         }
     // Notify component manager
     iComponentManager->HandleLayoutChangeL();
@@ -7133,18 +7124,6 @@
              iAppUi.iState->HandleVTCommandPerformedL( aCommand, aError ) ==
              TVtUiAppStateBase::EEventHandled )
             {
-            if( aCommand == KVtEngTerminateSession )//add for memory leak
-                {
-                const TInt count1 = iCommandObservers.Count();
-                for ( TInt index = 0; index < count1; index++ )
-                    {
-                    MVtEngCommandObserver* obs = iCommandObservers[ index ];
-                    if ( obs )
-                        {
-                        TRAP_IGNORE( obs->HandleVTCommandPerformedL( aCommand, aError ) );
-                        }
-                    }
-                }
             // state didn't allow further processing of command completion
             __VTPRINTEXITR( "VtUiComms.HandleVTCommandPerformedL %d", 0 )
             return;
@@ -7198,8 +7177,6 @@
         {
         __VTPRINT3( DEBUG_GEN,
             "VtUi.HandleVTCommandPerformedL cmd=%d err=%d", aCommand, aError );
-        
-        iAppUi.iShareImageOngoing = EFalse;
         if( aError != KErrNone )
             {
             // stop toolbar feature to prevent drawing over error dialog
@@ -7226,21 +7203,11 @@
                     TCallBack( &AsyncShare, &iAppUi ) );
                 }
             iAppUi.iAsyncCallback->CallBack();
-            iAppUi.iShareImageOngoing = ETrue;
-            }
-        else if( iAppUi.iUiStates->IsLayoutChangeNeeded() && 
-                aCommand == KVtEngStartShareImage && 
-                aCommand == iAppUi.iPendingCmd )
-            {
-            iAppUi.iPendingCmd = KVtEngCommandNone;
-            iAppUi.iUiStates->SetLayoutChangeNeeded( EFalse );
-            iAppUi.DoHandleLayoutChangedL();
             }
         }
     else if ( iAppUi.iUiStates->IsLayoutChangeNeeded() && 
             ( aCommand  == KVtEngSetSource ||
             aCommand  == KVtEngPrepareCamera ||
-            aCommand  == KVtEngStopShareImage ||
             aCommand  == KVtEngUnfreeze ||
             aCommand  == KVtEngHandleLayoutChange ) ||
             ( ( aCommand  == KVtEngMuteOutgoingAudio ||