From 1e60671f8a3cabccbb012b11fc82980d07f83f58 Mon Sep 17 00:00:00 2001 From: "bienvenu%nventure.com" Date: Tue, 12 Dec 2006 21:14:35 +0000 Subject: [PATCH] make custom db headers a space delimited list, not comma, follow on to 356860, sr=mscott git-svn-id: svn://10.0.0.236/trunk@216899 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/mailnews/imap/src/nsImapProtocol.cpp | 2 +- mozilla/mailnews/local/src/nsParseMailbox.cpp | 4 ++-- mozilla/mailnews/mailnews.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mozilla/mailnews/imap/src/nsImapProtocol.cpp b/mozilla/mailnews/imap/src/nsImapProtocol.cpp index ccc4a35b7d2..d24cf03d63b 100644 --- a/mozilla/mailnews/imap/src/nsImapProtocol.cpp +++ b/mozilla/mailnews/imap/src/nsImapProtocol.cpp @@ -345,7 +345,7 @@ nsresult nsImapProtocol::GlobalInitialization() prefBranch->GetIntPref("mailnews.tcptimeout", &gResponseTimeout); nsXPIDLCString customDBHeaders; prefBranch->GetCharPref("mailnews.customDBHeaders", getter_Copies(customDBHeaders)); - gCustomDBHeaders.ParseString(customDBHeaders, ", "); + gCustomDBHeaders.ParseString(customDBHeaders, " "); return NS_OK; } diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp index fef93c2af2c..706b16f3346 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.cpp +++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp @@ -478,7 +478,7 @@ nsParseMailMessageState::nsParseMailMessageState() // setup handling of custom db headers, headers that are added to .msf files // as properties of the nsMsgHdr objects, controlled by the - // pref mailnews.customDBHeaders. + // pref mailnews.customDBHeaders, a space-delimited list of headers. // E.g., if mailnews.customDBHeaders is "X-Spam-Score", and we're parsing // a mail message with the X-Spam-Score header, we'll set the // "x-spam-score" property of nsMsgHdr to the value of the header. @@ -489,7 +489,7 @@ nsParseMailMessageState::nsParseMailMessageState() { pPrefBranch->GetCharPref("mailnews.customDBHeaders", getter_Copies(customDBHeaders)); ToLowerCase(customDBHeaders); - m_customDBHeaders.ParseString(customDBHeaders, ", "); + m_customDBHeaders.ParseString(customDBHeaders, " "); if (m_customDBHeaders.Count()) { m_customDBHeaderValues = new struct message_header [m_customDBHeaders.Count()]; diff --git a/mozilla/mailnews/mailnews.js b/mozilla/mailnews/mailnews.js index 88545ab177e..f4302aff76b 100644 --- a/mozilla/mailnews/mailnews.js +++ b/mozilla/mailnews/mailnews.js @@ -380,6 +380,7 @@ pref("ldap_2.prefs_migrated", false); pref("mailnews.confirm.moveFoldersToTrash", true); +// space-delimited list of extra headers to add to .msf file pref("mailnews.customDBHeaders", ""); pref("mailnews.reuse_message_window", true);