smpatches-quantum/comm-central/patches/WIP-1650630-2-port-1603712-suite.patch

# HG changeset patch
# User Frank-Rainer Grahl <frgrahl@gmx.net>
# Date 1593949764 -7200
# Parent  5796e1ee890dbfe596df945ae2370580fc015596
Bug 1650630 - Part 2: Remove usage of intl.charset.detector.ng.enabled from SeaMonkey. r=IanN

diff --git a/suite/base/content/charsetOverlay.xhtml b/suite/base/content/charsetOverlay.xhtml
--- a/suite/base/content/charsetOverlay.xhtml
+++ b/suite/base/content/charsetOverlay.xhtml
@@ -1,22 +1,21 @@
 <?xml version="1.0"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE overlay SYSTEM "chrome://global/locale/charsetMenu.dtd">
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script>
-    ChromeUtils.import("resource://gre/modules/CharsetMenu.jsm");
+    var {CharsetMenu} =
+      ChromeUtils.import("resource://gre/modules/CharsetMenu.jsm");
 
-    function UpdateCharsetMenu(aCharset, aNode)
-    {
-      var bundle = document.getElementById("charsetBundle");
-      CharsetMenu.update(aNode, bundle.getString(aCharset.toLowerCase()));
+    function UpdateCharsetMenu(aCharset, aNode) {
+      CharsetMenu.update(aNode, aCharset);
     }
   </script>
 
   <menu id="charsetMenu"
         label="&charsetMenu2.label;"
         accesskey="&charsetMenu2.accesskey;">
     <menupopup id="charsetPopup"
                onpopupshowing="CharsetMenu.build(this, true, this.getAttribute('detectors') != 'false');"/>
diff --git a/suite/mailnews/components/prefs/content/pref-character_encoding.js b/suite/mailnews/components/prefs/content/pref-character_encoding.js
--- a/suite/mailnews/components/prefs/content/pref-character_encoding.js
+++ b/suite/mailnews/components/prefs/content/pref-character_encoding.js
@@ -18,16 +18,18 @@ function PrefChanged(aPref)
   if (updatingPref)
     return;
 
   var id = aPref.id.substr(9, 4) + "DefaultCharsetList";
   var menulist = document.getElementById(id);
   if (!aPref.hasUserValue)
     menulist.selectedIndex = 0;
   else {
+    // FIX ME
+    // charsetBundle does no longer exists as of bug 1650630
     var bundle = document.getElementById("charsetBundle");
     menulist.value = bundle.getString(aPref.value.toLowerCase());
   }
 }
 
 function UpdatePref(aMenulist)
 {
   updatingPref = true;