diff -r 930a53cdc2d3 -r d4cfc65049ba telephonyserver/etelmultimode/DTsy/mmtsymessaging.cpp --- a/telephonyserver/etelmultimode/DTsy/mmtsymessaging.cpp Thu Oct 07 19:32:01 2010 +0300 +++ b/telephonyserver/etelmultimode/DTsy/mmtsymessaging.cpp Fri Oct 15 11:27:58 2010 +0300 @@ -1712,8 +1712,7 @@ { case EMobileUssdMessagingReceiveMessage: return ReceiveMessageCancel(aTsyReqHandle); - case EMobileUssdMessagingSendMessageDefaultHandler: - return SendMessageCancelDefaultHandler(aTsyReqHandle); + case EMobileUssdMessagingSendMessageDefaultHandler: case EMobileUssdMessagingSendMessage: return SendMessageCancel(aTsyReqHandle); case EMobileUssdMessagingSendMessageNoFdnCheck: @@ -1806,13 +1805,7 @@ ReqCompleted(aTsyReqHandle,KErrCancel); return KErrNone; } -TInt CUssdMessagingDMmTsy::SendMessageCancelDefaultHandler(const TTsyReqHandle aTsyReqHandle) - { - LOGTEXT(_L8("CUssdMessagingDMmTsy::SendMessageCancelDefaultHandler called")); - iPhone->RemoveDelayedReq(aTsyReqHandle); - ReqCompleted(aTsyReqHandle,KErrCancel); - return KErrNone; - } + TInt CUssdMessagingDMmTsy::SendMessageNoFdnCheck(const TTsyReqHandle aTsyReqHandle, TDesC8* aMsgData, TDesC8* aMsgAttributes) /** * This method sends an outgoing SMS to the network. The number used for sending the SMS