mmserv/tms/tmscallserver/src/tmseteldtmfmonitor.cpp
changeset 20 b67dd1fc57c5
parent 14 80975da52420
child 26 d5c9562f0444
--- a/mmserv/tms/tmscallserver/src/tmseteldtmfmonitor.cpp	Fri Apr 30 19:18:45 2010 -0500
+++ b/mmserv/tms/tmscallserver/src/tmseteldtmfmonitor.cpp	Fri May 14 18:19:45 2010 -0500
@@ -39,6 +39,21 @@
     }
 
 // -----------------------------------------------------------------------------
+// Constructs the monitor.
+// -----------------------------------------------------------------------------
+//
+TMSEtelDtmfMonitor::TMSEtelDtmfMonitor(TMSDTMFProvider& aObserver,
+        RMmCustomAPI& aMmCustom) :
+    CActive(EPriorityStandard),
+    iObserver(aObserver),
+    iMmCustom(aMmCustom)
+    {
+    TRACE_PRN_FN_ENT;
+    CActiveScheduler::Add(this);
+    TRACE_PRN_FN_EXT;
+    }
+
+// -----------------------------------------------------------------------------
 // Destructs the object by canceling first ongoing monitoring.
 // -----------------------------------------------------------------------------
 //
@@ -73,7 +88,7 @@
 void TMSEtelDtmfMonitor::RunL()
     {
     TRACE_PRN_FN_ENT;
-    TInt err = iStatus.Int();
+    gint err = iStatus.Int();
     TRACE_PRN_N1(_L("**TMS TMSEtelDtmfMonitor::RunL: status:%d"), err);
 
     if (err == KErrNone)
@@ -143,25 +158,7 @@
 void TMSEtelDtmfMonitor::DoCancel()
     {
     TRACE_PRN_FN_ENT;
-    if (iStatus == KRequestPending)
-        {
-        iMmCustom.CancelAsyncRequest(ECustomNotifyDtmfEventIPC);
-        }
-    TRACE_PRN_FN_EXT;
-    }
-
-// -----------------------------------------------------------------------------
-// Constructs the monitor.
-// -----------------------------------------------------------------------------
-//
-TMSEtelDtmfMonitor::TMSEtelDtmfMonitor(TMSDTMFProvider& aObserver,
-        RMmCustomAPI& aMmCustom) :
-    CActive(EPriorityStandard),
-    iObserver(aObserver),
-    iMmCustom(aMmCustom)
-    {
-    TRACE_PRN_FN_ENT;
-    CActiveScheduler::Add(this);
+    iMmCustom.CancelAsyncRequest(ECustomNotifyDtmfEventIPC);
     TRACE_PRN_FN_EXT;
     }