112927 r/sr=sspitzer. add customHeaders pref to mailnews.js and handle this default case to work

mailnews/base/search/src/nsMsgSearchAdapter.cpp

@@ -1087,13 +1087,17 @@ nsMsgSearchValidityManager::NewTable(nsIMsgSearchValidityTable **aTable)
 nsresult 
 nsMsgSearchValidityManager::InitOtherHeadersInTable (nsIMsgSearchValidityTable *aTable, const char *customHeaders)
 {
-  PRUint32 strlen = PL_strlen(customHeaders);
+  PRUint32 customHeadersLength = PL_strlen(customHeaders);
   PRUint32 numHeaders=0;
   PRUint32 i=0;
-  for (i=0;i <strlen; i++)
-    if (customHeaders[i] == ':')
-      numHeaders++;
-  numHeaders++;
+  if (customHeadersLength)
+  {
+    for (i=0;i <customHeadersLength; i++)
+      if (customHeaders[i] == ':')
+        numHeaders++;
+    numHeaders++;
+  }
+
   NS_ASSERTION(nsMsgSearchAttrib::OtherHeader + numHeaders < nsMsgSearchAttrib::kNumMsgSearchAttributes, "more headers than the table can hold");
   for (i=nsMsgSearchAttrib::OtherHeader+1;i< (nsMsgSearchAttrib::OtherHeader + numHeaders+1) && nsMsgSearchAttrib::kNumMsgSearchAttributes;i++)
   {

mailnews/mailnews.js

@@ -400,4 +400,8 @@ pref("mailnews.labels.color.2", "#FF9900"); // default: orange
 pref("mailnews.labels.color.3", "#009900"); // default: green
 pref("mailnews.labels.color.4", "#3333FF"); // default: blue
 pref("mailnews.labels.color.5", "#993399"); // default: purple
+
+//default null headers
+//example "X-Warn: XReply", list of hdrs separated by ": "
+pref("mailnews.customHeaders", ""); 
  

modules/libpref/src/init/mailnews.js

@@ -400,4 +400,8 @@ pref("mailnews.labels.color.2", "#FF9900"); // default: orange
 pref("mailnews.labels.color.3", "#009900"); // default: green
 pref("mailnews.labels.color.4", "#3333FF"); // default: blue
 pref("mailnews.labels.color.5", "#993399"); // default: purple
+
+//default null headers
+//example "X-Warn: XReply", list of hdrs separated by ": "
+pref("mailnews.customHeaders", "");