Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 360792: mail.delete_matches_sort_order does not work when using imap mark as deleted model, patch by Magnus Melin <mkmelin+mozilla@iki.fi>, r=bienvenu

Browse Source
This commit is contained in:
gavin%gavinsharp.com 2006-11-22 17:47:52 +00:00
parent 0bbd020955
commit 4adb82e6aa
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mailnews/base/src/nsMsgDBView.cpp
View File

@ -5633,27 +5633,30 @@ nsMsgDBView::GetMsgToSelectAfterDelete(nsMsgViewIndex *msgToSelectAfterDelete)
PRBool thisIsImapFolder = (imapFolder != nsnull);
if (thisIsImapFolder) //need to update the imap-delete model, can change more than once in a session.
GetImapDeleteModel(nsnull);
// If mail.delete_matches_sort_order is true,
// for views sorted in descending order (newest at the top), make msgToSelectAfterDelete
// advance in the same direction as the sort order.
PRBool deleteMatchesSort = PR_FALSE;
if (m_sortOrder == nsMsgViewSortOrder::descending && *msgToSelectAfterDelete)
{
nsCOMPtr<nsIPrefBranch> prefBranch (do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
prefBranch->GetBoolPref("mail.delete_matches_sort_order", &deleteMatchesSort);
}
if (mDeleteModel == nsMsgImapDeleteModels::IMAPDelete)
{
if (selectionCount > 1 || (endRange-startRange) > 0) //multiple selection either using Ctrl or Shift keys
*msgToSelectAfterDelete = nsMsgViewIndex_None;
else if(deleteMatchesSort)
*msgToSelectAfterDelete -= 1;
else
*msgToSelectAfterDelete += 1;
}
else
else if (deleteMatchesSort)
{
// If mail.delete_matches_sort_order is true,
// for views sorted in descending order (newest at the top), make msgToSelectAfterDelete
// advance in the same direction as the sort order.
if (m_sortOrder == nsMsgViewSortOrder::descending && *msgToSelectAfterDelete)
{
nsCOMPtr<nsIPrefBranch> prefBranch (do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
NS_ENSURE_SUCCESS(rv, rv);
PRBool deleteMatchesSort = PR_FALSE;
prefBranch->GetBoolPref("mail.delete_matches_sort_order", &deleteMatchesSort);
if (deleteMatchesSort)
*msgToSelectAfterDelete -= 1;
}
*msgToSelectAfterDelete -= 1;
}
return NS_OK;