Bug 1068505 - React to the removal of non-Encoding Standard Mac encoders (Mac encodings other than MacRoman and MacCyrillic). r=jcranmer, a=mkmelin
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Sat, 20 Dec 2014 14:29:22 +0200
changeset 21514 ce58d0c3e55d11508c44b50527d03f2dd98beeef
parent 21513 27fc1f61d61a192d299998fbd2e7bc93dc803bd7
child 21515 3e883ab44c926e72291b3648be868040f4bec328
push id1305
push usermbanner@mozilla.com
push dateMon, 23 Feb 2015 19:48:12 +0000
treeherdercomm-beta@3ae4f13858fd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, mkmelin
bugs1068505
Bug 1068505 - React to the removal of non-Encoding Standard Mac encoders (Mac encodings other than MacRoman and MacCyrillic). r=jcranmer, a=mkmelin - Remove all traces of notForOutgoing, supported encoders are now hardcoded in CharsetMenu.jsm.
mailnews/intl/charsetData.properties
mailnews/intl/nsICharsetConverterManager.idl
--- a/mailnews/intl/charsetData.properties
+++ b/mailnews/intl/charsetData.properties
@@ -3,44 +3,30 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 ## Rule of this file:
 ## 1. key should always be in lower case ascii so we can do case insensitive
 ##    comparison in the code faster.
 
 ## Format of this file:
 ##
-## charset_name.notForOutgoing = anything  -  specifies that this charset is 
-## not to be used for exporting files ('SaveAsCharset' in composer)
-##
 ## charset_name.isInternal = anything - specifies that this charset should
 ## not be exposed to web content because of the vulnerability to XSS attacks
 ## or some other reasons
 ##
 ## charset_name.LangGroup = 
 ##
 ## charset_name.isMultibyte = multi byte charsets
 
 x-mac-arabic.isInternal                 = true
 x-mac-farsi.isInternal                  = true
 x-mac-hebrew.isInternal                 = true
 x-imap4-modified-utf7.isInternal        = true
 replacement.isInternal                  = true
 
-utf-7.notForOutgoing                    = true
-x-imap4-modified-utf7.notForOutgoing    = true
-ibm1125.notForOutgoing                  = true
-ibm1131.notForOutgoing                  = true
-iso-8859-8.notForOutgoing               = true
-replacement.notForOutgoing              = true
-
-# XXX : there are some entries only necessary for Gtk/Xlib builds
-# to map  XLFD registry-encoding pairs to langGroups. they can be
-# removed once bug 215537 is fixed.
-
 # XXX : todo: move to something based on BCP 47 (RFC 5646);
 # these should primarily specify script (and sometimes region),
 # but NOT language.
 # See also https://bugzilla.mozilla.org/show_bug.cgi?id=756022
 # e.g. x-western      -> *-Latn-155 (Western Europe)
 #      x-central-euro -> *-Latn-151 (Eastern Europe)
 #      x-baltic       -> *-Latn-154 (Northern Europe)
 #      x-cyrillic     -> *-Cyrl
--- a/mailnews/intl/nsICharsetConverterManager.idl
+++ b/mailnews/intl/nsICharsetConverterManager.idl
@@ -78,18 +78,16 @@ interface nsICharsetConverterManager : n
      */
     AString getCharsetTitle(in string aCharset);
 
     /**
      * Get some data about the given charset. This includes whether the 
      * character encoding may be used for certain purposes, if it is 
      * multi-byte, and the language code for it. See charsetData.properties
      * for the source of this data. Some known property names:
-     *    notForBrowser  - not to be used in the browser.
-     *    notForOutgoing - not to be used for exporting files.
      *    LangGroup      - language code for charset, e.g. 'he' and 'zh-CN'.
      *    isMultibyte    - is this a multi-byte charset?
      *    isInternal     - not to be used in untrusted web content.
      * 
      * @param aCharset name of the character encoding, e.g. 'iso-8859-15'.
      * @param aProp property desired for the character encoding.
      * @throws if aCharset is an unknown charset.
      * @return the value of the property, for the character encoding.