merge of add-jquery

--HG--
branch : gloda-facet

.hgpatchinfo/add-jquery.dep

@@ -1 +1 @@
-65b381ae1b8b3fc2da81d75e9067951524e9e1ea
+d94282bbed99e78e8d71466c179607bacbb1ee5b

.hgpatchinfo/add-protovis.dep

@@ -1 +1 @@
-34ba282bf5498c40cf4cfb7c9e5be911ceb4ad04
+85b424089b9f8a2c7c0c95ee00e7802c5a495c45

.hgpatchinfo/gloda-facet.dep

@@ -1 +1 @@
-dc908a9a0d068f6c4365697040f28334deb2c8c2
+a0efae9258e7c784122a30cc834fd652269e1caf

calendar/base/themes/pinstripe/calendar-unifinder.css

@@ -52,6 +52,16 @@
     border-bottom: 1px dotted #AAA;
 }
 
+#unifinder-search-results-tree > treechildren::-moz-tree-cell-text(highpriority) {
+   font-weight: bold;
+}
+
+#unifinder-search-results-tree > treechildren::-moz-tree-cell-text(lowpriority) {
+   font-style: italic;
+   color: GrayText !important;
+   background-color: -moz-field;
+}
+
 /* workaround to avoid Window Flick */
 #unifinder-search-results-tree {
     -moz-appearance: none;

calendar/base/themes/winstripe/calendar-unifinder.css

@@ -52,6 +52,16 @@
     border-bottom: 1px dotted #AAA;
 }
 
+#unifinder-search-results-tree > treechildren::-moz-tree-cell-text(highpriority) {
+   font-weight: bold;
+}
+
+#unifinder-search-results-tree > treechildren::-moz-tree-cell-text(lowpriority) {
+   font-style: italic;
+   color: GrayText !important;
+   background-color: -moz-field;
+}
+
 /* workaround to avoid Window Flick */
 #unifinder-search-results-tree {
    -moz-appearance: none;

mail/app/profile/all-thunderbird.js

@@ -461,3 +461,8 @@ pref("toolbar.customization.usesheet", false);
 pref("mail.compose.attachment_reminder", true);
 // Words that should trigger a missing attachments warning.
 pref("mail.compose.attachment_reminder_keywords", "chrome://messenger/locale/messengercompose/composeMsgs.properties");
+
+// Override the all.js values so that unit tests pass and we get sane values.
+pref("browser.history_expire_days", 180);
+pref("browser.history_expire_days_min", 90);
+pref("browser.history_expire_sites", 40000);

mail/base/content/msgHdrViewOverlay.js

@@ -64,9 +64,17 @@ var gHeadersShowReferences = false;
 // Show the friendly display names for people I know, instead of the name + email address.
 var gShowCondensedEmailAddresses;
 
-// other components may listen to on start header & on end header notifications for each message we display
-// to do that you need to add yourself to our gMessageListeners array with an object that supports the three properties:
-// onStartHeaders, onEndHeaders and onEndAttachments.
+/**
+ * Other components may listen to on start header & on end header notifications
+ * for each message we display: to do that you need to add yourself to our
+ * gMessageListeners array with an object that supports the three properties:
+ * onStartHeaders, onEndHeaders and onEndAttachments.
+ *
+ * Additionally, if your object has an onBeforeShowHeaderPane() method, it will
+ * be called at the appropriate time.  This is designed to give add-ons a
+ * chance to examine and modify the currentHeaderData array before it gets
+ * displayed.
+ */
 var gMessageListeners = new Array();
 
 // For every possible "view" in the message pane, you need to define the header names you want to
@@ -384,6 +392,12 @@ var messageHeaderSink = {
 
     onEndHeaders: function()
     {
+      // give add-ons a chance to modify currentHeaderData before it actually
+      // gets displayed
+      for (let index in gMessageListeners)
+        if ("onBeforeShowHeaderPane" in gMessageListeners[index])
+          gMessageListeners[index].onBeforeShowHeaderPane();
+
       ShowMessageHeaderPane();
       // WARNING: This is the ONLY routine inside of the message Header Sink that should
       // trigger a reflow!

mailnews/base/src/nsMessenger.cpp

@@ -969,12 +969,12 @@ enum MESSENGER_SAVEAS_FILE_TYPE
 {
  EML_FILE_TYPE =  0,
  HTML_FILE_TYPE = 1,
- TEXT_FILE_TYPE = 2
+ TEXT_FILE_TYPE = 2,
+ ANY_FILE_TYPE = 3
 };
 #define HTML_FILE_EXTENSION ".htm"
 #define HTML_FILE_EXTENSION2 ".html"
 #define TEXT_FILE_EXTENSION ".txt"
-#define EML_FILE_EXTENSION  ".eml"
 
 NS_IMETHODIMP
 nsMessenger::SaveAs(const nsACString& aURI, PRBool aAsFile, nsIMsgIdentity *aIdentity, const nsAString& aMsgFilename)
@@ -1159,9 +1159,12 @@ nsMessenger::GetSaveAsFile(const nsAString& aMsgFilename, PRInt32 *aSaveAsFileTy
                            NS_LITERAL_STRING("*.eml"));
   filePicker->AppendFilters(nsIFilePicker::filterHTML);
   filePicker->AppendFilters(nsIFilePicker::filterText);
+  filePicker->AppendFilters(nsIFilePicker::filterAll);
 
-  // Save as .eml by default
-  filePicker->SetFilterIndex(EML_FILE_TYPE);
+  // Save as the "All Files" file type by default. We want to save as .eml by
+  // default, but the filepickers on some platforms don't switch extensions
+  // based on the file type selected (bug 508597).
+  filePicker->SetFilterIndex(ANY_FILE_TYPE);
   // Yes, this is fine even if we ultimately save as HTML or text. On Windows,
   // this actually is a boolean telling the file picker to automatically add
   // the correct extension depending on the filter. On Mac or Linux this is a
@@ -1191,9 +1194,34 @@ nsMessenger::GetSaveAsFile(const nsAString& aMsgFilename, PRInt32 *aSaveAsFileTy
   rv = SetLastSaveDirectory(localFile);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  rv = filePicker->GetFilterIndex(aSaveAsFileType);
+  PRInt32 selectedSaveAsFileType;
+  rv = filePicker->GetFilterIndex(&selectedSaveAsFileType);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  // If All Files was selected, look at the extension
+  if (selectedSaveAsFileType == ANY_FILE_TYPE)
+  {
+    nsAutoString fileName;
+    rv = localFile->GetLeafName(fileName);
+    NS_ENSURE_SUCCESS(rv, rv);
+
+    if ((fileName.RFind(HTML_FILE_EXTENSION, PR_TRUE, -1,
+                        sizeof(HTML_FILE_EXTENSION) - 1) != kNotFound) ||
+        (fileName.RFind(HTML_FILE_EXTENSION2, PR_TRUE, -1,
+                        sizeof(HTML_FILE_EXTENSION2) - 1) != kNotFound))
+      *aSaveAsFileType = HTML_FILE_TYPE;
+    else if (fileName.RFind(TEXT_FILE_EXTENSION, PR_TRUE, -1,
+                            sizeof(TEXT_FILE_EXTENSION)-1) != kNotFound)
+      *aSaveAsFileType = TEXT_FILE_TYPE;
+    else
+      // The default is .eml
+      *aSaveAsFileType = EML_FILE_TYPE;
+  }
+  else
+  {
+    *aSaveAsFileType = selectedSaveAsFileType;
+  }
+
   if (dialogResult == nsIFilePicker::returnReplace)
   {
     // be extra safe and only delete when the file is really a file

suite/config/version-191.txt

@@ -1 +1 @@
-2.0b2pre
+2.0pre