--- a/logsui/AppSrc/CLogsBaseView.cpp	Wed Sep 15 11:56:55 2010 +0300
+++ b/logsui/AppSrc/CLogsBaseView.cpp	Wed Oct 13 14:15:33 2010 +0300
@@ -48,7 +48,7 @@
 #include <LogsApiConsts.h>      //additional event uids
 #include <CPhCltEmergencyCall.h>
 
-#include <logs.rsg>
+#include <Logs.rsg>
 
 #include "LogsIcons.hrh"
 #include "LogsConsts.h"
@@ -587,18 +587,8 @@
                   aViewIdToBeDeactivated.iAppUid != TUid::Uid(KLogsAppUID3) )
             {
             // Reset array, will call StateChangedL with state EStateArrayReseted and update the listbox.
-            if ( (aNewlyActivatedViewId.iViewUid.iUid == EStmDialledListViewId )||
-                    (aNewlyActivatedViewId.iViewUid.iUid == EStmMissedListViewId )||
-                    (aNewlyActivatedViewId.iViewUid.iUid == EStmReceivedListViewId ))
-                {
-                CurrentModel()->DoDeactivate( MLogsModel::ESkipClearing,
-                                                          MLogsModel::EKeepDBConnection ); 
-                }
-            else
-                {
-                CurrentModel()->DoDeactivate( MLogsModel::ESkipClearing,
-                                                          MLogsModel::EResetOnlyArray ); 
-                }	
+            CurrentModel()->DoDeactivate( MLogsModel::ESkipClearing,
+                                          MLogsModel::EResetOnlyArray ); 
             DrawComponents();
             TRAP(err, CancelSaveToPbkL());
             }
@@ -1715,32 +1705,6 @@
     TRACE_ENTRY_POINT;
     CAiwGenericParamList& paramList = iServHandlerRef->InParamListL();
 
-    // identify the call type to hide the matching call type from the menu
-    // The call items (voice, video and VoIP are located in the main level
-    // of the menu when the parameter EGenericParamHideCallSubmenu is passed
-    // to the aiw provider
-    if( !this-> OriginalCallMenuIsVisible() && ( NULL!= aEvent )&&( NULL!= aEvent->LogsEventData()))
-    	{
-    	TAiwVariant variant;
-    	
-    	// Video call
-        if ( aEvent->LogsEventData()->VT() )
-            {
-            variant.Set( EGenericParamVideoCall );
-            }
-        // VoIP call
-        else if ( aEvent->LogsEventData()->VoIP() )
-            {
-            variant.Set( EGenericParamVoIPCall );
-            }
-        // voice call
-        else 
-            {
-            variant.Set( EGenericParamVoiceCall );            
-            }
-        TAiwGenericParam param( EGenericParamHideCallSubmenu, variant );
-        paramList.AppendL( param );
-    	}   
     //Check do we provide only voice call (i.e. skip video call option)
     if ( !aVideo ) 
         {
@@ -1758,12 +1722,9 @@
  
 // Sawfish VoIP changes  >>>>
     TPtrC8 tempPtr( KNullDesC8 );
-    TInt result = KErrNotFound;
+    TInt result;
     CLogsCntLinkChecker* contactCheckerPtr;
-    if (( NULL!= aEvent )&&( NULL!= aEvent->LogsEventData()))
-        {
-         result = aEvent->LogsEventData()->GetContactLink( tempPtr );
-        }
+    result = aEvent->LogsEventData()->GetContactLink( tempPtr );
     
     if ( KErrNone == result )
         {   
@@ -1811,9 +1772,7 @@
         *aMenuPane,    //Handle of menu pane to initialise                                                  
         aResourceId,   //MenuResourceId                                                                     
         KAiwCmdCall,   //Base ID for the handler to generate menu IDs for placeholders                      
-        paramList,     //input parameter list for provider's parameters checking 
-        EFalse,        //Not use submenu
-        ETrue );                    
+        paramList );   //input parameter list for provider's parameters checking                  
     
     TRACE_EXIT_POINT;    
     }
@@ -3106,16 +3065,6 @@
     TRACE_EXIT_POINT;  
     }
 
-// ----------------------------------------------------------------------------
-// CLogsBaseView::OriginalCallMenuIsVisible
-// ----------------------------------------------------------------------------
-//
-TBool CLogsBaseView::OriginalCallMenuIsVisible()
-	{
-	// Original CallMenu is not visible
-	return EFalse;
-	}
-
 //  End of File