diff --git a/mailnews/base/public/nsIMsgDBView.idl b/mailnews/base/public/nsIMsgDBView.idl
index 1f704e523798..a04ef9c56ca3 100644
--- a/mailnews/base/public/nsIMsgDBView.idl
+++ b/mailnews/base/public/nsIMsgDBView.idl
@@ -247,7 +247,7 @@ interface nsMsgNavigationType
[scriptable, uuid(704c7d28-fd1a-11d4-a5be-0060b0fc04b7)]
interface nsIMsgDBView : nsISupports
{
- void open(in nsIMsgFolder folder, in nsMsgViewSortTypeValue sortType, in nsMsgViewSortOrderValue sortOrder, in nsMsgViewFlagsTypeValue viewFlags, in boolean aTreatRecipientAsAuthor, out long count);
+ void open(in nsIMsgFolder folder, in nsMsgViewSortTypeValue sortType, in nsMsgViewSortOrderValue sortOrder, in nsMsgViewFlagsTypeValue viewFlags, out long count);
void close();
void init(in nsIMessenger aMessengerInstance, in nsIMsgWindow aMsgWindow, in nsIMsgDBViewCommandUpdater aCommandUpdater);
diff --git a/mailnews/base/resources/content/commandglue.js b/mailnews/base/resources/content/commandglue.js
index 6718d26afa08..0f65c08605fc 100644
--- a/mailnews/base/resources/content/commandglue.js
+++ b/mailnews/base/resources/content/commandglue.js
@@ -389,18 +389,32 @@ function SwitchView(command)
function SetSentFolderColumns(isSentFolder)
{
- var senderOrRecipientColumn = document.getElementById("senderOrRecipientCol");
+ var tree = GetThreadTree();
var searchCriteria = document.getElementById("searchCriteria");
+
+ var lastFolderSent = tree.getAttribute("lastfoldersent") == "true";
+ if (isSentFolder != lastFolderSent)
+ {
+ var senderColumn = document.getElementById("senderCol");
+ var recipientColumn = document.getElementById("recipientCol");
+
+ var saveHidden = senderColumn.getAttribute("hidden");
+ senderColumn.setAttribute("hidden", senderColumn.getAttribute("swappedhidden"));
+ senderColumn.setAttribute("swappedhidden", saveHidden);
+
+ saveHidden = recipientColumn.getAttribute("hidden");
+ recipientColumn.setAttribute("hidden", recipientColumn.getAttribute("swappedhidden"));
+ recipientColumn.setAttribute("swappedhidden", saveHidden);
+ }
+
if(isSentFolder)
{
- senderOrRecipientColumn.setAttribute("tooltiptext", gMessengerBundle.getString("recipientColumnTooltip"));
- senderOrRecipientColumn.setAttribute("label", gMessengerBundle.getString("recipientColumnHeader"));
+ tree.setAttribute("lastfoldersent", "true");
searchCriteria.setAttribute("value", gMessengerBundle.getString("recipientSearchCriteria"));
}
else
{
- senderOrRecipientColumn.setAttribute("tooltiptext", gMessengerBundle.getString("senderColumnTooltip"));
- senderOrRecipientColumn.setAttribute("label", gMessengerBundle.getString("senderColumnHeader"));
+ tree.setAttribute("lastfoldersent", "false");
searchCriteria.setAttribute("value", gMessengerBundle.getString("senderSearchCriteria"));
}
}
@@ -447,13 +461,11 @@ function ConvertColumnIDToSortType(columnID)
case "dateCol":
sortKey = nsMsgViewSortType.byDate;
break;
- case "senderOrRecipientCol":
- if (IsSpecialFolderSelected(MSG_FOLDER_FLAG_SENTMAIL | MSG_FOLDER_FLAG_DRAFTS | MSG_FOLDER_FLAG_QUEUE)) {
- sortKey = nsMsgViewSortType.byRecipient;
- }
- else {
- sortKey = nsMsgViewSortType.byAuthor;
- }
+ case "senderCol":
+ sortKey = nsMsgViewSortType.byAuthor;
+ break;
+ case "recipientCol":
+ sortKey = nsMsgViewSortType.byRecipient;
break;
case "subjectCol":
sortKey = nsMsgViewSortType.bySubject;
@@ -509,8 +521,10 @@ function ConvertSortTypeToColumnID(sortKey)
columnID = "dateCol";
break;
case nsMsgViewSortType.byAuthor:
+ columnID = "senderCol";
+ break;
case nsMsgViewSortType.byRecipient:
- columnID = "senderOrRecipientCol";
+ columnID = "recipientCol";
break;
case nsMsgViewSortType.bySubject:
columnID = "subjectCol";
@@ -598,18 +612,11 @@ function CreateBareDBView(originalView, msgFolder, viewType, viewFlags, sortType
if (!gThreadPaneCommandUpdater)
gThreadPaneCommandUpdater = new nsMsgDBViewCommandUpdater();
- if ((sortType == nsMsgViewSortType.byAuthor) && IsSpecialFolder(msgFolder, MSG_FOLDER_FLAG_SENTMAIL | MSG_FOLDER_FLAG_DRAFTS | MSG_FOLDER_FLAG_QUEUE)) {
- gCurSortType = nsMsgViewSortType.byRecipient;
- }
- else {
- gCurSortType = sortType;
- }
+ gCurSortType = sortType;
if (!originalView) {
gDBView.init(messenger, msgWindow, gThreadPaneCommandUpdater);
-
- var treatRecipientAsAuthor = IsSpecialFolder(msgFolder, MSG_FOLDER_FLAG_SENTMAIL | MSG_FOLDER_FLAG_DRAFTS | MSG_FOLDER_FLAG_QUEUE);
- gDBView.open(msgFolder, gCurSortType, sortOrder, viewFlags, treatRecipientAsAuthor, count);
+ gDBView.open(msgFolder, gCurSortType, sortOrder, viewFlags, count);
}
else {
gDBView = originalView.cloneDBView(messenger, msgWindow, gThreadPaneCommandUpdater);
diff --git a/mailnews/base/resources/content/mailContextMenus.js b/mailnews/base/resources/content/mailContextMenus.js
index f50877c807a9..390baa3c9a58 100644
--- a/mailnews/base/resources/content/mailContextMenus.js
+++ b/mailnews/base/resources/content/mailContextMenus.js
@@ -311,9 +311,9 @@ function fillFolderPaneContextMenu()
EnableMenuItem("folderPaneContext-markNewsgroupAllRead", true);
// End of News folder context menu =======================================
-
- ShowMenuItem("folderPaneContext-markMailFolderAllRead", (numSelected <= 1) && ! isNewsgroup);
- EnableMenuItem("folderPaneContext-markMailFolderAllRead", true);
+
+ ShowMenuItem("folderPaneContext-markMailFolderAllRead", (numSelected <= 1) && ! isNewsgroup);
+ EnableMenuItem("folderPaneContext-markMailFolderAllRead", true);
ShowMenuItem("folderPaneContext-searchMessages", (numSelected<=1));
EnableMenuItem("folderPaneContext-searchMessages", IsCanSearchMessagesEnabled());
diff --git a/mailnews/base/resources/content/mailWindowOverlay.js b/mailnews/base/resources/content/mailWindowOverlay.js
index cb09f6b7af42..27d1a9e3230c 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mailnews/base/resources/content/mailWindowOverlay.js
@@ -218,21 +218,9 @@ function InitViewSortByMenu()
setSortByMenuItemCheckState("sortByUnreadMenuitem", (sortType == nsMsgViewSortType.byUnread));
setSortByMenuItemCheckState("sortByLabelMenuitem", (sortType == nsMsgViewSortType.byLabel));
setSortByMenuItemCheckState("sortByJunkStatusMenuitem", (sortType == nsMsgViewSortType.byJunkStatus));
-
- // the Sender / Recipient menu is dynamic
- setSortByMenuItemCheckState("sortBySenderOrRecipientMenuitem", (sortType == nsMsgViewSortType.byAuthor) || (sortType == nsMsgViewSortType.byRecipient));
- var senderOrRecipientMenuitem = document.getElementById("sortBySenderOrRecipientMenuitem");
- if (senderOrRecipientMenuitem) {
- var currentFolder = gDBView.msgFolder;
- if (IsSpecialFolder(currentFolder, MSG_FOLDER_FLAG_SENTMAIL | MSG_FOLDER_FLAG_DRAFTS | MSG_FOLDER_FLAG_QUEUE)) {
- senderOrRecipientMenuitem.setAttribute('label',gMessengerBundle.getString('recipientColumnHeader'));
- senderOrRecipientMenuitem.setAttribute('accesskey',gMessengerBundle.getString('recipientAccessKey'));
- }
- else {
- senderOrRecipientMenuitem.setAttribute('label',gMessengerBundle.getString('senderColumnHeader'));
- senderOrRecipientMenuitem.setAttribute('accesskey',gMessengerBundle.getString('senderAccessKey'));
- }
- }
+ setSortByMenuItemCheckState("sortBySenderMenuitem", (sortType == nsMsgViewSortType.byAuthor));
+ setSortByMenuItemCheckState("sortByRecipientMenuitem", (sortType == nsMsgViewSortType.byRecipient));
+
var sortOrder = gDBView.sortOrder;
setSortByMenuItemCheckState("sortAscending", (sortOrder == nsMsgViewSortOrder.ascending));
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 8900233eed27..5d6f0cc48b2c 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -648,10 +648,10 @@ Rights Reserved.
-
+
-
-
+
+
diff --git a/mailnews/base/resources/content/threadPane.js b/mailnews/base/resources/content/threadPane.js
index a3e3b1eb408a..10b56ac6fd39 100644
--- a/mailnews/base/resources/content/threadPane.js
+++ b/mailnews/base/resources/content/threadPane.js
@@ -170,14 +170,14 @@ function MsgSortByDate()
MsgSortThreadPane(nsMsgViewSortType.byDate);
}
-function MsgSortBySenderOrRecipient()
+function MsgSortBySender()
{
- if (IsSpecialFolderSelected(MSG_FOLDER_FLAG_SENTMAIL | MSG_FOLDER_FLAG_DRAFTS | MSG_FOLDER_FLAG_QUEUE)) {
- MsgSortThreadPane(nsMsgViewSortType.byRecipient);
- }
- else {
- MsgSortThreadPane(nsMsgViewSortType.byAuthor);
- }
+ MsgSortThreadPane(nsMsgViewSortType.byAuthor);
+}
+
+function MsgSortByRecipient()
+{
+ MsgSortThreadPane(nsMsgViewSortType.byRecipient);
}
function MsgSortByStatus()
@@ -373,7 +373,7 @@ function ThreadPaneOnLoad()
var tree = GetThreadTree();
tree.addEventListener("click",ThreadPaneOnClick,true);
-
+
// The mousedown event listener below should only be added in the thread
// pane of the mailnews 3pane window, not in the advanced search window.
if(tree.parentNode.id == "searchResultListBox")
diff --git a/mailnews/base/resources/content/threadPane.xul b/mailnews/base/resources/content/threadPane.xul
index 639339b89ff7..4ab062f79594 100644
--- a/mailnews/base/resources/content/threadPane.xul
+++ b/mailnews/base/resources/content/threadPane.xul
@@ -35,7 +35,7 @@ Contributors:
-
@@ -48,8 +48,10 @@ Contributors:
-
+
diff --git a/mailnews/base/resources/locale/en-US/messenger.dtd b/mailnews/base/resources/locale/en-US/messenger.dtd
index 8805793d4107..ca2026d9ffe1 100644
--- a/mailnews/base/resources/locale/en-US/messenger.dtd
+++ b/mailnews/base/resources/locale/en-US/messenger.dtd
@@ -165,7 +165,10 @@ Rights Reserved.
-
+
+
+
+
@@ -493,7 +496,7 @@ Rights Reserved.
-
+
diff --git a/mailnews/base/resources/locale/en-US/messenger.properties b/mailnews/base/resources/locale/en-US/messenger.properties
index de749ae478ba..059b61678346 100644
--- a/mailnews/base/resources/locale/en-US/messenger.properties
+++ b/mailnews/base/resources/locale/en-US/messenger.properties
@@ -102,14 +102,6 @@ serverType-none=Local Mail Store
# LOCALIZATION NOTES(serverType-movemail): DONT_TRANSLATE
serverType-movemail=Unix Movemail
-# used in the column and in the "View | Sort By " menu
-recipientColumnTooltip=Click to sort by recipient
-recipientColumnHeader=Recipient
-recipientAccessKey=n
-senderColumnTooltip=Click to sort by sender
-senderColumnHeader=Sender
-senderAccessKey=n
-
sizeColumnTooltip=Click to sort by size
sizeColumnHeader=Size
linesColumnTooltip=Click to sort by lines
diff --git a/mailnews/base/resources/locale/en-US/threadpane.dtd b/mailnews/base/resources/locale/en-US/threadpane.dtd
index d23f94d65edc..bda8241d40ab 100644
--- a/mailnews/base/resources/locale/en-US/threadpane.dtd
+++ b/mailnews/base/resources/locale/en-US/threadpane.dtd
@@ -20,6 +20,7 @@ Rights Reserved.
+
@@ -39,6 +40,7 @@ Rights Reserved.
+
diff --git a/mailnews/base/search/resources/content/SearchDialog.js b/mailnews/base/search/resources/content/SearchDialog.js
index f2ee17ac1dfa..24cef608a751 100644
--- a/mailnews/base/search/resources/content/SearchDialog.js
+++ b/mailnews/base/search/resources/content/SearchDialog.js
@@ -497,7 +497,7 @@ function setupDatasource() {
var cmdupdator = new nsMsgSearchCommandUpdater();
gSearchView.init(messenger, msgWindow, cmdupdator);
- gSearchView.open(null, nsMsgViewSortType.byId, nsMsgViewSortOrder.ascending, nsMsgViewFlagsType.kNone, false, count);
+ gSearchView.open(null, nsMsgViewSortType.byId, nsMsgViewSortOrder.ascending, nsMsgViewFlagsType.kNone, count);
// the thread pane needs to use the search datasource (to get the
// actual list of messages) and the message datasource (to get any
diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.cpp
index 3741ab745be6..cab92d0cce33 100644
--- a/mailnews/base/src/nsMsgDBView.cpp
+++ b/mailnews/base/src/nsMsgDBView.cpp
@@ -137,7 +137,6 @@ nsMsgDBView::nsMsgDBView()
mSuppressMsgDisplay = PR_FALSE;
mSuppressCommandUpdating = PR_FALSE;
mSuppressChangeNotification = PR_FALSE;
- mTreatRecipientAsAuthor = PR_FALSE;
mIsNews = PR_FALSE;
mDeleteModel = nsMsgImapDeleteModels::MoveToTrash;
m_deletingRows = PR_FALSE;
@@ -502,11 +501,7 @@ nsresult nsMsgDBView::FetchAuthor(nsIMsgHdr * aHdr, PRUnichar ** aSenderString)
if (!mHeaderParser)
mHeaderParser = do_GetService(NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID);
- nsresult rv = NS_OK;
- if (mTreatRecipientAsAuthor)
- rv = aHdr->GetMime2DecodedRecipients(getter_Copies(unparsedAuthor));
- else
- rv = aHdr->GetMime2DecodedAuthor(getter_Copies(unparsedAuthor));
+ nsresult rv = aHdr->GetMime2DecodedAuthor(getter_Copies(unparsedAuthor));
// *sigh* how sad, we need to convert our beautiful unicode string to utf8
// so we can extract the name part of the address...then convert it back to
@@ -526,6 +521,32 @@ nsresult nsMsgDBView::FetchAuthor(nsIMsgHdr * aHdr, PRUnichar ** aSenderString)
return NS_OK;
}
+nsresult nsMsgDBView::FetchRecipient(nsIMsgHdr * aHdr, PRUnichar ** aRecipientString)
+{
+ nsXPIDLString unparsedRecipient;
+ if (!mHeaderParser)
+ mHeaderParser = do_GetService(NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID);
+
+ nsresult rv = aHdr->GetMime2DecodedRecipients(getter_Copies(unparsedRecipient));
+
+ // *sigh* how sad, we need to convert our beautiful unicode string to utf8
+ // so we can extract the name part of the address...then convert it back to
+ // unicode again.
+ if (mHeaderParser)
+ {
+ nsXPIDLCString name;
+ rv = mHeaderParser->ExtractHeaderAddressName("UTF-8", NS_ConvertUCS2toUTF8(unparsedRecipient).get(), getter_Copies(name));
+ if (NS_SUCCEEDED(rv) && (const char*)name)
+ {
+ *aRecipientString = nsCRT::strdup(NS_ConvertUTF8toUCS2(name).get());
+ return NS_OK;
+ }
+ }
+ // if we got here then just return the original string
+ *aRecipientString = nsCRT::strdup(unparsedRecipient);
+ return NS_OK;
+}
+
nsresult nsMsgDBView::FetchSubject(nsIMsgHdr * aMsgHdr, PRUint32 aFlags, PRUnichar ** aValue)
{
if (aFlags & MSG_FLAG_HAS_RE)
@@ -1503,6 +1524,10 @@ NS_IMETHODIMP nsMsgDBView::GetCellText(PRInt32 aRow, const PRUnichar * aColID, n
rv = FetchStatus(m_flags[aRow], getter_Copies(valueText));
aValue.Assign(valueText);
break;
+ case 'r': // recipient
+ rv = FetchRecipient(msgHdr, getter_Copies(valueText));
+ aValue.Assign(valueText);
+ break;
case 'd': // date
rv = FetchDate(msgHdr, getter_Copies(valueText));
aValue.Assign(valueText);
@@ -1691,12 +1716,11 @@ NS_IMETHODIMP nsMsgDBView::PerformActionOnCell(const PRUnichar *action, PRInt32
// end nsITreeView Implementation Methods
///////////////////////////////////////////////////////////////////////////
-NS_IMETHODIMP nsMsgDBView::Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, PRBool aTreatRecipientAsAuthor, PRInt32 *pCount)
+NS_IMETHODIMP nsMsgDBView::Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, PRInt32 *pCount)
{
m_viewFlags = viewFlags;
m_sortOrder = sortOrder;
m_sortType = sortType;
- mTreatRecipientAsAuthor = aTreatRecipientAsAuthor;
nsMsgViewTypeValue viewType;
@@ -5803,7 +5827,6 @@ nsresult nsMsgDBView::CopyDBView(nsMsgDBView *aNewMsgDBView, nsIMessenger *aMess
aNewMsgDBView->mIsNews = mIsNews;
aNewMsgDBView->mHeaderParser = mHeaderParser;
aNewMsgDBView->mDeleteModel = mDeleteModel;
- aNewMsgDBView->mTreatRecipientAsAuthor = mTreatRecipientAsAuthor;
aNewMsgDBView->m_flags.CopyArray(m_flags);
aNewMsgDBView->m_levels.CopyArray(m_levels);
aNewMsgDBView->m_keys.CopyArray(m_keys);
diff --git a/mailnews/base/src/nsMsgDBView.h b/mailnews/base/src/nsMsgDBView.h
index 2cb6aba024bb..8f30ccc96f4a 100644
--- a/mailnews/base/src/nsMsgDBView.h
+++ b/mailnews/base/src/nsMsgDBView.h
@@ -158,6 +158,7 @@ protected:
PRPackedBool mSuppressChangeNotification;
virtual const char * GetViewName(void) {return "MsgDBView"; }
nsresult FetchAuthor(nsIMsgHdr * aHdr, PRUnichar ** aAuthorString);
+ nsresult FetchRecipient(nsIMsgHdr * aHdr, PRUnichar ** aRecipientString);
nsresult FetchSubject(nsIMsgHdr * aMsgHdr, PRUint32 aFlags, PRUnichar ** aValue);
nsresult FetchDate(nsIMsgHdr * aHdr, PRUnichar ** aDateString);
nsresult FetchStatus(PRUint32 aFlags, PRUnichar ** aStatusString);
@@ -337,7 +338,6 @@ protected:
// and decendents of those folders
// (like the "Sent" folder, "Sent/Old Sent")
// the Sender column really shows recipients.
- PRPackedBool mTreatRecipientAsAuthor;
PRPackedBool mIsNews; // we have special icons for news, and for news, we show lines instead of size
PRPackedBool m_sortValid;
PRUint8 m_saveRestoreSelectionDepth;
diff --git a/mailnews/base/src/nsMsgSearchDBView.cpp b/mailnews/base/src/nsMsgSearchDBView.cpp
index e5929146422c..3105138fb78d 100644
--- a/mailnews/base/src/nsMsgSearchDBView.cpp
+++ b/mailnews/base/src/nsMsgSearchDBView.cpp
@@ -60,13 +60,13 @@ nsMsgSearchDBView::~nsMsgSearchDBView()
NS_IMPL_ISUPPORTS_INHERITED3(nsMsgSearchDBView, nsMsgDBView, nsIMsgDBView, nsIMsgCopyServiceListener, nsIMsgSearchNotify)
-NS_IMETHODIMP nsMsgSearchDBView::Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, PRBool aTreatRecipientAsAuthor, PRInt32 *pCount)
+NS_IMETHODIMP nsMsgSearchDBView::Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, PRInt32 *pCount)
{
nsresult rv;
m_folders = do_CreateInstance(NS_SUPPORTSARRAY_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
- rv = nsMsgDBView::Open(folder, sortType, sortOrder, viewFlags, aTreatRecipientAsAuthor, pCount);
+ rv = nsMsgDBView::Open(folder, sortType, sortOrder, viewFlags, pCount);
NS_ENSURE_SUCCESS(rv, rv);
if (pCount)
diff --git a/mailnews/base/src/nsMsgSearchDBView.h b/mailnews/base/src/nsMsgSearchDBView.h
index 88e49ca52391..a230ed3badb6 100644
--- a/mailnews/base/src/nsMsgSearchDBView.h
+++ b/mailnews/base/src/nsMsgSearchDBView.h
@@ -55,7 +55,7 @@ public:
virtual const char * GetViewName(void) {return "SearchView"; }
NS_IMETHOD Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder,
- nsMsgViewFlagsTypeValue viewFlags, PRBool aTreatRecipientAsAuthor, PRInt32 *pCount);
+ nsMsgViewFlagsTypeValue viewFlags, PRInt32 *pCount);
NS_IMETHOD Close();
NS_IMETHOD Sort(nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder);
NS_IMETHOD DoCommand(nsMsgViewCommandTypeValue command);
diff --git a/mailnews/base/src/nsMsgSpecialViews.cpp b/mailnews/base/src/nsMsgSpecialViews.cpp
index 384cd8e66269..b606c8b179dc 100644
--- a/mailnews/base/src/nsMsgSpecialViews.cpp
+++ b/mailnews/base/src/nsMsgSpecialViews.cpp
@@ -47,11 +47,6 @@ nsMsgThreadsWithUnreadDBView::~nsMsgThreadsWithUnreadDBView()
{
}
-NS_IMETHODIMP nsMsgThreadsWithUnreadDBView::Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, PRBool aTreatRecipientAsAuthor, PRInt32 *pCount)
-{
- return nsMsgThreadedDBView::Open(folder, sortType, sortOrder, viewFlags, aTreatRecipientAsAuthor, pCount);
-}
-
NS_IMETHODIMP nsMsgThreadsWithUnreadDBView::GetViewType(nsMsgViewTypeValue *aViewType)
{
NS_ENSURE_ARG_POINTER(aViewType);
diff --git a/mailnews/base/src/nsMsgSpecialViews.h b/mailnews/base/src/nsMsgSpecialViews.h
index 4e2701788cb4..d2442224b9f9 100644
--- a/mailnews/base/src/nsMsgSpecialViews.h
+++ b/mailnews/base/src/nsMsgSpecialViews.h
@@ -46,7 +46,6 @@ public:
nsMsgThreadsWithUnreadDBView();
virtual ~nsMsgThreadsWithUnreadDBView();
virtual const char * GetViewName(void) {return "ThreadsWithUnreadView"; }
- NS_IMETHOD Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, PRBool aTreatRecipientAsAuthor, PRInt32 *pCount);
NS_IMETHOD CloneDBView(nsIMessenger *aMessengerInstance, nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCommandUpdater, nsIMsgDBView **_retval);
NS_IMETHOD GetViewType(nsMsgViewTypeValue *aViewType);
diff --git a/mailnews/base/src/nsMsgThreadedDBView.cpp b/mailnews/base/src/nsMsgThreadedDBView.cpp
index 540dcbe344b2..193f2ffe0a4e 100644
--- a/mailnews/base/src/nsMsgThreadedDBView.cpp
+++ b/mailnews/base/src/nsMsgThreadedDBView.cpp
@@ -56,9 +56,9 @@ nsMsgThreadedDBView::~nsMsgThreadedDBView()
/* destructor code */
}
-NS_IMETHODIMP nsMsgThreadedDBView::Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, PRBool aTreatRecipientAsAuthor, PRInt32 *pCount)
+NS_IMETHODIMP nsMsgThreadedDBView::Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, PRInt32 *pCount)
{
- nsresult rv = nsMsgDBView::Open(folder, sortType, sortOrder, viewFlags, aTreatRecipientAsAuthor, pCount);
+ nsresult rv = nsMsgDBView::Open(folder, sortType, sortOrder, viewFlags, pCount);
NS_ENSURE_SUCCESS(rv, rv);
// Preset msg hdr cache size for performance reason.
diff --git a/mailnews/base/src/nsMsgThreadedDBView.h b/mailnews/base/src/nsMsgThreadedDBView.h
index 6b3547000afc..f3c5acd216cb 100644
--- a/mailnews/base/src/nsMsgThreadedDBView.h
+++ b/mailnews/base/src/nsMsgThreadedDBView.h
@@ -49,7 +49,7 @@ public:
nsMsgThreadedDBView();
virtual ~nsMsgThreadedDBView();
- NS_IMETHOD Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, PRBool aTreatRecipientAsAuthor, PRInt32 *pCount);
+ NS_IMETHOD Open(nsIMsgFolder *folder, nsMsgViewSortTypeValue sortType, nsMsgViewSortOrderValue sortOrder, nsMsgViewFlagsTypeValue viewFlags, PRInt32 *pCount);
NS_IMETHOD CloneDBView(nsIMessenger *aMessengerInstance, nsIMsgWindow *aMsgWindow, nsIMsgDBViewCommandUpdater *aCommandUpdater, nsIMsgDBView **_retval);
NS_IMETHOD Close();
virtual nsresult AddKeys(nsMsgKey *pKeys, PRInt32 *pFlags, const char *pLevels, nsMsgViewSortTypeValue sortType, PRInt32 numKeysToAdd);