merge fx-team to mozilla-central

2014-04-07 13:37:38 +02:00 · 2014-04-07 13:37:38 +02:00 · 866ee03bc2
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@ -73,7 +73,7 @@
                          accesskey="&emailPageCmd.accesskey;"
                          command="Browser:SendLink"/>
                <menuseparator/>
-#ifndef XP_LINUX
+#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
                <menuitem id="menu_printSetup"
                          label="&printSetupCmd.label;"
                          accesskey="&printSetupCmd.accesskey;"
--- a/content/base/test/test_bug431701.html
+++ b/content/base/test/test_bug431701.html
@ -4,6 +4,7 @@
 https://bugzilla.mozilla.org/show_bug.cgi?id=431701
 -->
 <head>
+  <meta charset="windows-1252">
  <title>Test for Bug 431701</title>
  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
--- a/testing/mochitest/server.js
+++ b/testing/mochitest/server.js
@ -678,7 +678,7 @@ function testListing(metadata, response)
 function defaultDirHandler(metadata, response)
 {
  response.setStatusLine("1.1", 200, "OK");
-  response.setHeader("Content-type", "text/html", false);
+  response.setHeader("Content-type", "text/html;charset=utf-8", false);
  try {
    if (metadata.path.indexOf("/tests") != 0) {
      regularListing(metadata, response);