From 53221e07c24b46cd25e59f484dd1f83ff2e6812f Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Thu, 29 Mar 2001 03:27:41 +0000 Subject: [PATCH] Show the user agent string again if the user has the hidden pref set. If we receive multiple "To" or "cc" headers in the same message, aggregate them instead of just using the last one. --- .../resources/content/msgHdrViewOverlay.js | 26 +++++++++++++++---- .../resources/content/msgHdrViewOverlay.xul | 7 +++++ 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/mailnews/base/resources/content/msgHdrViewOverlay.js b/mailnews/base/resources/content/msgHdrViewOverlay.js index a1874e02017..3b19abd8922 100644 --- a/mailnews/base/resources/content/msgHdrViewOverlay.js +++ b/mailnews/base/resources/content/msgHdrViewOverlay.js @@ -170,6 +170,13 @@ function initializeHeaderViewTables() var headerName = gExpandedHeaderList[index].name; gExpandedHeaderView[headerName] = new createHeaderEntry('expanded', gExpandedHeaderList[index]); } + + if (gShowUserAgent) + { + var userAgentEntry = {name:"user-agent", outputFunction:updateHeaderValueInTextNode}; + gExpandedHeaderView[userAgentEntry.name] = new createHeaderEntry('expanded', userAgentEntry); + } + } function OnLoadMsgHeaderPane() @@ -178,15 +185,14 @@ function OnLoadMsgHeaderPane() // otherwise we have problems. document.loadBindingDocument('chrome://messenger/content/mailWidgets.xml'); - - initializeHeaderViewTables(); - + // load any preferences that at are global with regards to // displaying a message... gNumAddressesToShow = pref.GetIntPref("mailnews.max_header_display_length"); - gShowUserAgent = pref.GetBoolPref("mailnews.headers.showUserAgent"); gCollectIncoming = pref.GetBoolPref("mail.collect_email_address_incoming"); gCollectNewsgroup = pref.GetBoolPref("mail.collect_email_address_newsgroup"); + gShowUserAgent = pref.GetBoolPref("mailnews.headers.showUserAgent"); + initializeHeaderViewTables(); } // The messageHeaderSink is the class that gets notified of a message's headers as we display the message @@ -241,7 +247,16 @@ var messageHeaderSink = { var foo = new Object; foo.headerValue = headerValue; foo.headerName = headerName; - currentHeaderData[lowerCaseHeaderName] = foo; + + // some times, you can have multiple To or cc lines....in this case, we want to APPEND + // these headers into one. + if ( (lowerCaseHeaderName == 'to' || lowerCaseHeaderName == 'cc') && ( lowerCaseHeaderName in currentHeaderData)) + { + currentHeaderData[lowerCaseHeaderName].headerValue = currentHeaderData[lowerCaseHeaderName].headerValue + ',' + foo.headerValue; + } + else + currentHeaderData[lowerCaseHeaderName] = foo; + if (lowerCaseHeaderName == "from") { if (headerValue && abAddressCollector && @@ -440,6 +455,7 @@ function ShowMessageHeaderPane() if (messagePaneBox && gFolderJustSwitched) { messagePaneBox.setAttribute("collapsed", "false"); + messagePaneBox.removeAttribute("collapsed"); gFolderJustSwitched = false; } } diff --git a/mailnews/base/resources/content/msgHdrViewOverlay.xul b/mailnews/base/resources/content/msgHdrViewOverlay.xul index 8f09c47f7cd..d2b9b2ef308 100644 --- a/mailnews/base/resources/content/msgHdrViewOverlay.xul +++ b/mailnews/base/resources/content/msgHdrViewOverlay.xul @@ -131,6 +131,13 @@ Rights Reserved. * + + + + + + +