--- a/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/inc/mmtsy/cmmphonetsy.h	Wed Sep 01 12:40:21 2010 +0100
@@ -31,6 +31,7 @@
 #include "cmmmessagemanagerbase.h"
 #include "MmTsy_timeoutdefs.h"
 #include <ctsy/serviceapi/mmtsy_defaults.h>
+#include <ctsy/tflogger.h>
 #include "CMmPrivateUtility.h"
 #include <ctsy/serviceapi/ctsydomainpskeys.h>
 #include <ctsy/serviceapi/mctsysatservice.h>
@@ -123,10 +124,13 @@
             EMultimodePhoneNotifyNWSelectionSettingChange, 
             EMultimodePhoneNotifyNWTimeInfoChange, //15
             EMultimodePhoneSelectNetwork, 
-            EMultimodePhoneSetNWSelectionSetting, 
+            EMultimodePhoneSetNWSelectionSetting,
+            EMultimodePhoneGetPreferredNetworksPhase1,
+            EMultimodePhoneStorePreferredNetworksList,
+            EMultimodePhoneNotifyStorePreferredNetworksListChange, // 20
             EMultimodePhoneSetCallForwardingStatus, 
             EMultimodePhoneGetIdentityServiceStatus,
-            EMultimodePhoneSetCallBarringStatus, //20
+            EMultimodePhoneSetCallBarringStatus,
             EMultimodePhoneSetSSPassword,
             EMultimodePhoneSetCallWaitingStatus,
             EMultimodePhoneSetFdnSetting,
@@ -201,7 +205,6 @@
             EMultimodePhoneNotifyAllSendNetworkServiceRequest,
             EMultimodePhoneGetCurrentActiveUSimApplication,             
             EMultimodePhoneTerminateAllCalls,
-            EMultimodePhoneTerminateActiveCalls,
             EMultimodePhoneNotifyDtmfEvent, 
             // ATTENTION:: Declare constant for those requests that need
             // own request handle record in iTsyReqHandleStore above the
@@ -1414,13 +1417,6 @@
         void CompleteTerminateAllCallsReq(TInt aErrorCode);
         
         /**
-         * Complete TerminateActiveCalls request
-         * 
-         * @param aErrorCode The result of the request
-         */
-        void CompleteTerminateActiveCallsReq(TInt aErrorCode);
-        
-        /**
         * Notify change of battery info
         *          
         * @param aErrorCode error code
@@ -2181,14 +2177,6 @@
           */
         TInt TerminateAllCallsL(const TTsyReqHandle aTsyReqHandle);
 
-        /**
-          * Terminate all active calls simultaneously
-          * 
-          * @param aTsyReqHandle TSY req handle
-          * @return Error value
-          */
-        TInt TerminateActiveCallsL(const TTsyReqHandle aTsyReqHandle);
-        
         /*
          * This function return availability of Hareware Resource Manager in the current ROM
          *