diff -r ac48f0cc9f9c -r 755f0370535b mmsharing/mmshui/src/musuisendcontroller.cpp --- a/mmsharing/mmshui/src/musuisendcontroller.cpp Wed Sep 15 12:09:15 2010 +0300 +++ b/mmsharing/mmshui/src/musuisendcontroller.cpp Wed Oct 13 14:28:06 2010 +0300 @@ -39,8 +39,6 @@ #include #include -_LIT16( KMusUSign, "%U" ); - using namespace NMusSessionApi; @@ -403,31 +401,9 @@ { MUS_LOG( "mus: [MUSUI ] -> CMusUiSendController::SessionRejected" ); DismissWaitDialog(); - - delete iDialogPrompt; - iDialogPrompt = NULL; - - TRAP_IGNORE ( iDialogPrompt = StringLoader::LoadL( - R_MUS_LIVE_SHARING_VIEW_NOTE_CONNECTION_REJECTED ) ); - - if ( iDialogPrompt->Find( KMusUSign ) >= KErrNone ) - { - delete iDialogPrompt; - iDialogPrompt = NULL; - TRAP_IGNORE ( iDialogPrompt = StringLoader::LoadL( - R_MUS_LIVE_SHARING_VIEW_NOTE_CONNECTION_REJECTED, - MusTelNumberValue() ) ); - } - else - { - // NOP - } - - if ( iDialogPrompt ) - { - TRAP_IGNORE ( - MusUiDialogUtil::ShowInformationDialogL( *iDialogPrompt ) ); - } + TRAP_IGNORE ( + MusUiDialogUtil::ShowInformationDialogL( + R_MUS_LIVE_SHARING_VIEW_NOTE_CONNECTION_REJECTED ) ); TRAP_IGNORE( iCallbackService->AsyncEventL( EMusUiAsyncHandleExit ) ); @@ -664,7 +640,7 @@ MUS_LOG( "mus: [MUSUI ] -> CMusUiSendController::ExitProcedureL" ); DismissWaitDialog(); - iEventObserver.SetExitingFlag(); + switch ( iShutdownState ) { case EMusUiShutdownStarted: