diff -r 72d484772ca6 -r a3a1ae9acec6 emailuis/emailui/src/FreestyleEmailUiSearchListVisualiser.cpp --- a/emailuis/emailui/src/FreestyleEmailUiSearchListVisualiser.cpp Fri Mar 12 15:41:14 2010 +0200 +++ b/emailuis/emailui/src/FreestyleEmailUiSearchListVisualiser.cpp Mon Mar 15 12:39:10 2010 +0200 @@ -621,49 +621,53 @@ if (aResourceId == R_FSEMAILUI_SEARCHLIST_SUBMENU_ACTIONS) { CFSEmailUiMailListModelItem* item = dynamic_cast(iModel->Item(HighlightedIndex())); - CFSMailMessage* messagePtr = &item->MessagePtr(); - TInt menuIndex( 0 ); - - //Get # of recipients - TInt numRecipients(0); - if ( messagePtr ) + if(item) // Coverity error fix Item could have been NULL { - numRecipients =TFsEmailUiUtility::CountRecepients( messagePtr ); - if ( numRecipients == 1 ) + CFSMailMessage* messagePtr = &item->MessagePtr(); + TInt menuIndex( 0 ); + + //Get # of recipients + TInt numRecipients(0); + if ( messagePtr ) { - //check if the malbox ownmailaddress is same as the recipients email address. If not, then assume that the - //email is a distribution list and we need to inc num of Recipients so that "Reply ALL" option appears in UI. - if ( messagePtr->GetToRecipients().Count() ) + numRecipients =TFsEmailUiUtility::CountRecepients( messagePtr ); + if ( numRecipients == 1 ) { - if ( iAppUi.GetActiveMailbox()->OwnMailAddress().GetEmailAddress().Compare(messagePtr->GetToRecipients()[0]->GetEmailAddress()) ) + //check if the malbox ownmailaddress is same as the recipients email address. If not, then assume that the + //email is a distribution list and we need to inc num of Recipients so that "Reply ALL" option appears in UI. + if ( messagePtr->GetToRecipients().Count() ) { - numRecipients++; - } - } - if ( messagePtr->GetCCRecipients().Count() ) - { - if ( iAppUi.GetActiveMailbox()->OwnMailAddress().GetEmailAddress().Compare(messagePtr->GetCCRecipients()[0]->GetEmailAddress()) ) + if ( iAppUi.GetActiveMailbox()->OwnMailAddress().GetEmailAddress().Compare(messagePtr->GetToRecipients()[0]->GetEmailAddress()) ) { numRecipients++; } } - if ( messagePtr->GetBCCRecipients().Count() ) - { - if ( iAppUi.GetActiveMailbox()->OwnMailAddress().GetEmailAddress().Compare(messagePtr->GetBCCRecipients()[0]->GetEmailAddress()) ) + if ( messagePtr->GetCCRecipients().Count() ) { - numRecipients++; + if ( iAppUi.GetActiveMailbox()->OwnMailAddress().GetEmailAddress().Compare(messagePtr->GetCCRecipients()[0]->GetEmailAddress()) ) + { + numRecipients++; + } } - } + if ( messagePtr->GetBCCRecipients().Count() ) + { + if ( iAppUi.GetActiveMailbox()->OwnMailAddress().GetEmailAddress().Compare(messagePtr->GetBCCRecipients()[0]->GetEmailAddress()) ) + { + numRecipients++; + } + } + } + } - } - if ( numRecipients > 1 ) - { - aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, EFalse ); - } - else if ( aMenuPane->MenuItemExists( EFsEmailUiCmdActionsReplyAll, menuIndex ) ) - { - aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, ETrue ); + if ( numRecipients > 1 ) + { + aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, EFalse ); + } + else if ( aMenuPane->MenuItemExists( EFsEmailUiCmdActionsReplyAll, menuIndex ) ) + { + aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, ETrue ); + } } } @@ -815,7 +819,7 @@ if( Layout_Meta_Data::IsLandscapeOrientation() ) { // landscape must use different layout - res = R_AVKON_STATUS_PANE_LAYOUT_IDLE_FLAT; + res = R_AVKON_STATUS_PANE_LAYOUT_USUAL_EXT; } if ( StatusPane()->CurrentLayoutResId() != res ) @@ -1897,7 +1901,7 @@ CFSMailBox* activeMailbox = iAppUi.GetActiveMailbox(); if ( activeMailbox && aMailbox.Id() == activeMailbox->GetId().Id() ) // Safety, in list events that only concern active mailbox are handled { - if ( iModel && iModel->Count() && aEvent == TFSEventMailDeleted ) + if ( iModel && iModel->Count() && (aEvent == TFSEventMailDeleted || aEvent == TFSEventMailDeletedFromViewer) ) { RArray* removedEntries = static_cast*>(aParam1); if ( removedEntries && removedEntries->Count() )