Bug 623610 - Remove support for geostd8; r=smontagu
authorMs2ger <ms2ger@gmail.com>
Mon, 02 Jan 2012 19:05:20 +0100
changeset 86091 b3030d5f893b6ee6165a197ea4b7087edf012cef
parent 86090 5d10897fecd0e3ebba4f371ffeba4054efc72c7f
child 86092 941801e7439cf019790590c6e6d72a86a7b1f0c6
push id674
push userffxbld
push dateTue, 13 Mar 2012 21:17:50 +0000
treeherdermozilla-beta@e3c4c92dec31 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmontagu
bugs623610
milestone12.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 623610 - Remove support for geostd8; r=smontagu
dom/locales/en-US/chrome/charsetTitles.properties
intl/locale/src/charsetalias.properties
intl/uconv/directory.txt
intl/uconv/src/charsetData.properties
intl/uconv/src/nsUConvModule.cpp
intl/uconv/tests/unit/test_decode_geostd8.js
intl/uconv/tests/unit/test_encode_geostd8.js
intl/uconv/tests/unit/xpcshell.ini
intl/uconv/ucvlatin/Makefile.in
intl/uconv/ucvlatin/geostd8.uf
intl/uconv/ucvlatin/geostd8.ut
intl/uconv/ucvlatin/nsGEOSTD8ToUnicode.cpp
intl/uconv/ucvlatin/nsGEOSTD8ToUnicode.h
intl/uconv/ucvlatin/nsUCvLatinCID.h
intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.cpp
intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.h
modules/libpref/src/init/all.js
toolkit/locales/en-US/chrome/global/intl.properties
--- a/dom/locales/en-US/chrome/charsetTitles.properties
+++ b/dom/locales/en-US/chrome/charsetTitles.properties
@@ -91,17 +91,16 @@ koi8-r.title = Cyrillic (KOI8-R)
 koi8-u.title = Cyrillic/Ukrainian (KOI8-U)
 iso-8859-7.title = Greek (ISO-8859-7)
 windows-1253.title = Greek (Windows-1253)
 x-mac-greek.title = Greek (MacGreek)
 windows-1258.title = Vietnamese (Windows-1258)
 x-viet-tcvn5712.title = Vietnamese (TCVN)
 viscii.title = Vietnamese (VISCII)
 x-viet-vps.title = Vietnamese (VPS)
-geostd8.title = Georgian (GEOSTD8)
 tis-620.title = Thai (TIS-620)
 iso-8859-11.title = Thai (ISO-8859-11)
 windows-874.title = Thai (Windows-874)
 ibm874.title = Thai (IBM-874)
 armscii-8.title = Armenian (ARMSCII-8)
 iso-8859-6.title = Arabic (ISO-8859-6)
 iso-8859-6-i.title = Arabic (ISO-8859-6-I)
 iso-8859-6-e.title = Arabic (ISO-8859-6-E)
--- a/intl/locale/src/charsetalias.properties
+++ b/intl/locale/src/charsetalias.properties
@@ -136,17 +136,16 @@ x-mac-romanian=x-mac-romanian
 x-mac-cyrillic=x-mac-cyrillic
 x-mac-ukrainian=x-mac-cyrillic
 x-mac-hebrew=x-mac-hebrew
 x-mac-arabic=x-mac-arabic
 x-mac-farsi=x-mac-farsi
 x-mac-devanagari=x-mac-devanagari
 x-mac-gujarati=x-mac-gujarati
 x-mac-gurmukhi=x-mac-gurmukhi
-geostd8=GEOSTD8
 armscii-8=armscii-8
 x-viet-tcvn5712=x-viet-tcvn5712
 x-viet-vps=x-viet-vps
 iso-10646-ucs-2=UTF-16BE
 x-iso-10646-ucs-2-be=UTF-16BE
 x-iso-10646-ucs-2-le=UTF-16LE
 x-user-defined=x-user-defined
 x-johab=x-johab
--- a/intl/uconv/directory.txt
+++ b/intl/uconv/directory.txt
@@ -12,17 +12,17 @@ util       - utility functions used by t
 
 The following directories contain different charset converters:
 
 ucvcn    - Simplified Chinese charsets - GB2312, HZ, ISO-2022-CN, GBK, GB18030
 ucvibm   - IBM charsets - CP850, 852, 855, 857, 862, 864, 869, 1125, 1131
 ucvja    - Japanese charsets - Shift-JIS, ISO-2022-JP, EUC-JP
 ucvko    - Korean charsets - ISO-2022-KR, EUC-KR, CP949
 ucvlatin - Latin charsets and others - ISO-8859-x, CP1250-1258
-                            CP866, 874, GEOSTD8, ARMSCII, ISO-IR-111, KOI8,
+                            CP866, 874, ARMSCII, ISO-IR-111, KOI8,
                             Mac charsets, T61, TIS620, TCVN, VISCII, VPS
                             UTF7, UTF16
 ucvtw    - Traditional Chinese charsets Set 1 - Big5
 ucvtw2   - Traditional Chinese charsets Set 2 - EUC-TW
 
 Within the directories containing charset converters:
 
 *.ut - tables used to convert to Unicode from a charset
--- a/intl/uconv/src/charsetData.properties
+++ b/intl/uconv/src/charsetData.properties
@@ -132,17 +132,16 @@ big5.LangGroup                     = zh-
 x-x-big5.LangGroup                 = zh-TW
 big5-hkscs.LangGroup               = zh-HK
 euc-jp.LangGroup                   = ja
 euc-kr.LangGroup                   = ko
 gb2312.LangGroup                   = zh-CN
 gb18030.LangGroup                  = zh-CN
 gb18030.2000-0.LangGroup           = zh-CN
 gb18030.2000-1.LangGroup           = zh-CN
-geostd8.LangGroup                  = x-geor
 hkscs-1.LangGroup                  = zh-HK
 hz-gb-2312.LangGroup               = zh-CN
 ibm850.LangGroup                   = x-western
 ibm852.LangGroup                   = x-central-euro
 ibm855.LangGroup                   = x-cyrillic
 ibm857.LangGroup                   = tr
 ibm862.LangGroup                   = he
 ibm864.LangGroup                   = ar
--- a/intl/uconv/src/nsUConvModule.cpp
+++ b/intl/uconv/src/nsUConvModule.cpp
@@ -110,17 +110,16 @@
 #include "nsKOI8UToUnicode.h"
 #include "nsMacCEToUnicode.h"
 #include "nsMacGreekToUnicode.h"
 #include "nsMacTurkishToUnicode.h"
 #include "nsMacCroatianToUnicode.h"
 #include "nsMacRomanianToUnicode.h"
 #include "nsMacCyrillicToUnicode.h"
 #include "nsMacIcelandicToUnicode.h"
-#include "nsGEOSTD8ToUnicode.h"
 #include "nsARMSCII8ToUnicode.h"
 #include "nsTCVN5712ToUnicode.h"
 #include "nsVISCIIToUnicode.h"
 #include "nsVPSToUnicode.h"
 #include "nsUTF7ToUnicode.h"
 #include "nsMUTF7ToUnicode.h"
 #include "nsUCS2BEToUnicode.h"
 #include "nsT61ToUnicode.h"
@@ -160,17 +159,16 @@
 #include "nsUnicodeToKOI8U.h"
 #include "nsUnicodeToMacCE.h"
 #include "nsUnicodeToMacGreek.h"
 #include "nsUnicodeToMacTurkish.h"
 #include "nsUnicodeToMacCroatian.h"
 #include "nsUnicodeToMacRomanian.h"
 #include "nsUnicodeToMacCyrillic.h"
 #include "nsUnicodeToMacIcelandic.h"
-#include "nsUnicodeToGEOSTD8.h"
 #include "nsUnicodeToARMSCII8.h"
 #include "nsUnicodeToTCVN5712.h"
 #include "nsUnicodeToVISCII.h"
 #include "nsUnicodeToVPS.h"
 #include "nsUnicodeToUTF7.h"
 #include "nsUnicodeToMUTF7.h"
 #include "nsUnicodeToUCS2BE.h"
 #include "nsUnicodeToT61.h"
@@ -311,17 +309,16 @@ NS_UCONV_REG_UNREG("KOI8-R", NS_KOI8RTOU
 NS_UCONV_REG_UNREG("KOI8-U", NS_KOI8UTOUNICODE_CID, NS_UNICODETOKOI8U_CID)
 NS_UCONV_REG_UNREG("x-mac-ce", NS_MACCETOUNICODE_CID, NS_UNICODETOMACCE_CID)
 NS_UCONV_REG_UNREG("x-mac-greek", NS_MACGREEKTOUNICODE_CID, NS_UNICODETOMACGREEK_CID)
 NS_UCONV_REG_UNREG("x-mac-turkish", NS_MACTURKISHTOUNICODE_CID, NS_UNICODETOMACTURKISH_CID)
 NS_UCONV_REG_UNREG("x-mac-croatian", NS_MACCROATIANTOUNICODE_CID, NS_UNICODETOMACCROATIAN_CID)
 NS_UCONV_REG_UNREG("x-mac-romanian", NS_MACROMANIANTOUNICODE_CID, NS_UNICODETOMACROMANIAN_CID)
 NS_UCONV_REG_UNREG("x-mac-cyrillic", NS_MACCYRILLICTOUNICODE_CID, NS_UNICODETOMACCYRILLIC_CID)
 NS_UCONV_REG_UNREG("x-mac-icelandic", NS_MACICELANDICTOUNICODE_CID, NS_UNICODETOMACICELANDIC_CID)
-NS_UCONV_REG_UNREG("GEOSTD8", NS_GEOSTD8TOUNICODE_CID, NS_UNICODETOGEOSTD8_CID)
 NS_UCONV_REG_UNREG("armscii-8", NS_ARMSCII8TOUNICODE_CID, NS_UNICODETOARMSCII8_CID)
 NS_UCONV_REG_UNREG("x-viet-tcvn5712", NS_TCVN5712TOUNICODE_CID, NS_UNICODETOTCVN5712_CID)
 NS_UCONV_REG_UNREG("VISCII", NS_VISCIITOUNICODE_CID, NS_UNICODETOVISCII_CID)
 NS_UCONV_REG_UNREG("x-viet-vps", NS_VPSTOUNICODE_CID, NS_UNICODETOVPS_CID)
 NS_UCONV_REG_UNREG("UTF-7", NS_UTF7TOUNICODE_CID, NS_UNICODETOUTF7_CID)
 NS_UCONV_REG_UNREG("x-imap4-modified-utf7", NS_MUTF7TOUNICODE_CID, NS_UNICODETOMUTF7_CID)
 NS_UCONV_REG_UNREG("UTF-16", NS_UTF16TOUNICODE_CID, NS_UNICODETOUTF16_CID)
 NS_UCONV_REG_UNREG("UTF-16BE", NS_UTF16BETOUNICODE_CID, NS_UNICODETOUTF16BE_CID)
@@ -611,17 +608,16 @@ NS_DEFINE_NAMED_CID(NS_KOI8RTOUNICODE_CI
 NS_DEFINE_NAMED_CID(NS_KOI8UTOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_MACCETOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_MACGREEKTOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_MACTURKISHTOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_MACCROATIANTOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_MACROMANIANTOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_MACCYRILLICTOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_MACICELANDICTOUNICODE_CID);
-NS_DEFINE_NAMED_CID(NS_GEOSTD8TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_ARMSCII8TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_TCVN5712TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_VISCIITOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_VPSTOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_UTF7TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_MUTF7TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_UTF16TOUNICODE_CID);
 NS_DEFINE_NAMED_CID(NS_UTF16BETOUNICODE_CID);
@@ -669,17 +665,16 @@ NS_DEFINE_NAMED_CID(NS_UNICODETOKOI8R_CI
 NS_DEFINE_NAMED_CID(NS_UNICODETOKOI8U_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOMACCE_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOMACGREEK_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOMACTURKISH_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOMACCROATIAN_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOMACROMANIAN_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOMACCYRILLIC_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOMACICELANDIC_CID);
-NS_DEFINE_NAMED_CID(NS_UNICODETOGEOSTD8_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOARMSCII8_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOTCVN5712_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOVISCII_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOVPS_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOUTF7_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOMUTF7_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOUTF16BE_CID);
 NS_DEFINE_NAMED_CID(NS_UNICODETOUTF16LE_CID);
@@ -802,17 +797,16 @@ static const mozilla::Module::CIDEntry k
   { &kNS_KOI8UTOUNICODE_CID, false, NULL, nsKOI8UToUnicodeConstructor },
   { &kNS_MACCETOUNICODE_CID, false, NULL, nsMacCEToUnicodeConstructor },
   { &kNS_MACGREEKTOUNICODE_CID, false, NULL, nsMacGreekToUnicodeConstructor },
   { &kNS_MACTURKISHTOUNICODE_CID, false, NULL, nsMacTurkishToUnicodeConstructor },
   { &kNS_MACCROATIANTOUNICODE_CID, false, NULL, nsMacCroatianToUnicodeConstructor },
   { &kNS_MACROMANIANTOUNICODE_CID, false, NULL, nsMacRomanianToUnicodeConstructor },
   { &kNS_MACCYRILLICTOUNICODE_CID, false, NULL, nsMacCyrillicToUnicodeConstructor },
   { &kNS_MACICELANDICTOUNICODE_CID, false, NULL, nsMacIcelandicToUnicodeConstructor },
-  { &kNS_GEOSTD8TOUNICODE_CID, false, NULL, nsGEOSTD8ToUnicodeConstructor },
   { &kNS_ARMSCII8TOUNICODE_CID, false, NULL, nsARMSCII8ToUnicodeConstructor },
   { &kNS_TCVN5712TOUNICODE_CID, false, NULL, nsTCVN5712ToUnicodeConstructor },
   { &kNS_VISCIITOUNICODE_CID, false, NULL, nsVISCIIToUnicodeConstructor },
   { &kNS_VPSTOUNICODE_CID, false, NULL, nsVPSToUnicodeConstructor },
   { &kNS_UTF7TOUNICODE_CID, false, NULL, nsUTF7ToUnicodeConstructor },
   { &kNS_MUTF7TOUNICODE_CID, false, NULL, nsMUTF7ToUnicodeConstructor },
   { &kNS_UTF16TOUNICODE_CID, false, NULL, nsUTF16ToUnicodeConstructor },
   { &kNS_UTF16BETOUNICODE_CID, false, NULL, nsUTF16BEToUnicodeConstructor },
@@ -860,17 +854,16 @@ static const mozilla::Module::CIDEntry k
   { &kNS_UNICODETOKOI8U_CID, false, NULL, nsUnicodeToKOI8UConstructor },
   { &kNS_UNICODETOMACCE_CID, false, NULL, nsUnicodeToMacCEConstructor },
   { &kNS_UNICODETOMACGREEK_CID, false, NULL, nsUnicodeToMacGreekConstructor },
   { &kNS_UNICODETOMACTURKISH_CID, false, NULL, nsUnicodeToMacTurkishConstructor },
   { &kNS_UNICODETOMACCROATIAN_CID, false, NULL, nsUnicodeToMacCroatianConstructor },
   { &kNS_UNICODETOMACROMANIAN_CID, false, NULL, nsUnicodeToMacRomanianConstructor },
   { &kNS_UNICODETOMACCYRILLIC_CID, false, NULL, nsUnicodeToMacCyrillicConstructor },
   { &kNS_UNICODETOMACICELANDIC_CID, false, NULL, nsUnicodeToMacIcelandicConstructor },
-  { &kNS_UNICODETOGEOSTD8_CID, false, NULL, nsUnicodeToGEOSTD8Constructor },
   { &kNS_UNICODETOARMSCII8_CID, false, NULL, nsUnicodeToARMSCII8Constructor },
   { &kNS_UNICODETOTCVN5712_CID, false, NULL, nsUnicodeToTCVN5712Constructor },
   { &kNS_UNICODETOVISCII_CID, false, NULL, nsUnicodeToVISCIIConstructor },
   { &kNS_UNICODETOVPS_CID, false, NULL, nsUnicodeToVPSConstructor },
   { &kNS_UNICODETOUTF7_CID, false, NULL, nsUnicodeToUTF7Constructor },
   { &kNS_UNICODETOMUTF7_CID, false, NULL, nsUnicodeToMUTF7Constructor },
   { &kNS_UNICODETOUTF16BE_CID, false, NULL, nsUnicodeToUTF16BEConstructor },
   { &kNS_UNICODETOUTF16LE_CID, false, NULL, nsUnicodeToUTF16LEConstructor },
@@ -995,17 +988,16 @@ static const mozilla::Module::ContractID
   { NS_UNICODEDECODER_CONTRACTID_BASE "KOI8-U", &kNS_KOI8UTOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-ce", &kNS_MACCETOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-greek", &kNS_MACGREEKTOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-turkish", &kNS_MACTURKISHTOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-croatian", &kNS_MACCROATIANTOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-romanian", &kNS_MACROMANIANTOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-cyrillic", &kNS_MACCYRILLICTOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-mac-icelandic", &kNS_MACICELANDICTOUNICODE_CID },
-  { NS_UNICODEDECODER_CONTRACTID_BASE "GEOSTD8", &kNS_GEOSTD8TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "armscii-8", &kNS_ARMSCII8TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-viet-tcvn5712", &kNS_TCVN5712TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "VISCII", &kNS_VISCIITOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-viet-vps", &kNS_VPSTOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "UTF-7", &kNS_UTF7TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "x-imap4-modified-utf7", &kNS_MUTF7TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "UTF-16", &kNS_UTF16TOUNICODE_CID },
   { NS_UNICODEDECODER_CONTRACTID_BASE "UTF-16BE", &kNS_UTF16BETOUNICODE_CID },
@@ -1053,17 +1045,16 @@ static const mozilla::Module::ContractID
   { NS_UNICODEENCODER_CONTRACTID_BASE "KOI8-U", &kNS_UNICODETOKOI8U_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-ce", &kNS_UNICODETOMACCE_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-greek", &kNS_UNICODETOMACGREEK_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-turkish", &kNS_UNICODETOMACTURKISH_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-croatian", &kNS_UNICODETOMACCROATIAN_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-romanian", &kNS_UNICODETOMACROMANIAN_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-cyrillic", &kNS_UNICODETOMACCYRILLIC_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-mac-icelandic", &kNS_UNICODETOMACICELANDIC_CID },
-  { NS_UNICODEENCODER_CONTRACTID_BASE "GEOSTD8", &kNS_UNICODETOGEOSTD8_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "armscii-8", &kNS_UNICODETOARMSCII8_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-viet-tcvn5712", &kNS_UNICODETOTCVN5712_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "VISCII", &kNS_UNICODETOVISCII_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-viet-vps", &kNS_UNICODETOVPS_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "UTF-7", &kNS_UNICODETOUTF7_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "x-imap4-modified-utf7", &kNS_UNICODETOMUTF7_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "UTF-16BE", &kNS_UNICODETOUTF16BE_CID },
   { NS_UNICODEENCODER_CONTRACTID_BASE "UTF-16LE", &kNS_UNICODETOUTF16LE_CID },
deleted file mode 100644
--- a/intl/uconv/tests/unit/test_decode_geostd8.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Tests conversion from geostd8 to Unicode
-	
-load('CharsetConversionTests.js');
-	
-const inString = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x80\x82\x84\x85\x86\x87\x89\x8b\x91\x92\x93\x94\x95\x96\x97\x9b\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xfd";
-    
-const expectedString = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u20ac\u201a\u201e\u2026\u2020\u2021\u2030\u2039\u2018\u2019\u201c\u201d\u2022\u2013\u2014\u203a\u00a0\u00a1\u00a2\u00a3\u00a4\u00a5\u00a6\u00a7\u00a8\u00a9\u00aa\u00ab\u00ac\u00ad\u00ae\u00af\u00b0\u00b1\u00b2\u00b3\u00b4\u00b5\u00b6\u00b7\u00b8\u00b9\u00ba\u00bb\u00bc\u00bd\u00be\u00bf\u10d0\u10d1\u10d2\u10d3\u10d4\u10d5\u10d6\u10f1\u10d7\u10d8\u10d9\u10da\u10db\u10dc\u10f2\u10dd\u10de\u10df\u10e0\u10e1\u10e2\u10f3\u10e3\u10e4\u10e5\u10e6\u10e7\u10e8\u10e9\u10ea\u10eb\u10ec\u10ed\u10ee\u10f4\u10ef\u10f0\u10f5\u2116";
-
-const aliases = ["GEOSTD8"];
-
-function run_test() {
-  testDecodeAliases();
-}
deleted file mode 100644
--- a/intl/uconv/tests/unit/test_encode_geostd8.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Tests conversion from Unicode to geostd8
-	
-load('CharsetConversionTests.js');
-	
-const inString = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u20ac\u201a\u201e\u2026\u2020\u2021\u2030\u2039\u2018\u2019\u201c\u201d\u2022\u2013\u2014\u203a\u00a0\u00a1\u00a2\u00a3\u00a4\u00a5\u00a6\u00a7\u00a8\u00a9\u00aa\u00ab\u00ac\u00ad\u00ae\u00af\u00b0\u00b1\u00b2\u00b3\u00b4\u00b5\u00b6\u00b7\u00b8\u00b9\u00ba\u00bb\u00bc\u00bd\u00be\u00bf\u10d0\u10d1\u10d2\u10d3\u10d4\u10d5\u10d6\u10f1\u10d7\u10d8\u10d9\u10da\u10db\u10dc\u10f2\u10dd\u10de\u10df\u10e0\u10e1\u10e2\u10f3\u10e3\u10e4\u10e5\u10e6\u10e7\u10e8\u10e9\u10ea\u10eb\u10ec\u10ed\u10ee\u10f4\u10ef\u10f0\u10f5\u2116";
-    
-const expectedString = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\x80\x82\x84\x85\x86\x87\x89\x8b\x91\x92\x93\x94\x95\x96\x97\x9b\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xfd";
-
-const aliases = ["GEOSTD8"];
-
-function run_test() {
-  testEncodeAliases();
-}
--- a/intl/uconv/tests/unit/xpcshell.ini
+++ b/intl/uconv/tests/unit/xpcshell.ini
@@ -55,17 +55,16 @@ tail =
 [test_decode_CP850.js]
 [test_decode_CP852.js]
 [test_decode_CP855.js]
 [test_decode_CP857.js]
 [test_decode_CP862.js]
 [test_decode_CP864.js]
 [test_decode_CP874.js]
 [test_decode_armscii.js]
-[test_decode_geostd8.js]
 [test_decode_gbk.js]
 [test_decode_tcvn5712.js]
 [test_decode_utf-7_internal.js]
 [test_decode_utf-7.js]
 [test_decode_viscii.js]
 [test_decode_vps.js]
 [test_decode_x_mac_arabic.js]
 [test_decode_x_mac_arabic_internal.js]
@@ -111,17 +110,16 @@ tail =
 [test_encode_CP850.js]
 [test_encode_CP852.js]
 [test_encode_CP855.js]
 [test_encode_CP857.js]
 [test_encode_CP862.js]
 [test_encode_CP864.js]
 [test_encode_CP874.js]
 [test_encode_armscii.js]
-[test_encode_geostd8.js]
 [test_encode_gbk.js]
 [test_encode_tcvn5712.js]
 [test_encode_utf-7_internal.js]
 [test_encode_utf-7.js]
 [test_encode_viscii.js]
 [test_encode_vps.js]
 [test_encode_x_mac_arabic.js]
 [test_encode_x_mac_arabic_internal.js]
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@@ -90,17 +90,16 @@ CPPSRCS		= \
 		nsMacCyrillicToUnicode.cpp \
 		nsMacIcelandicToUnicode.cpp \
 		nsMacHebrewToUnicode.cpp \
 		nsMacArabicToUnicode.cpp \
 		nsMacDevanagariToUnicode.cpp \
 		nsMacFarsiToUnicode.cpp \
 		nsMacGujaratiToUnicode.cpp \
 		nsMacGurmukhiToUnicode.cpp \
-		nsGEOSTD8ToUnicode.cpp \
 		nsARMSCII8ToUnicode.cpp \
 		nsTCVN5712ToUnicode.cpp \
 		nsVISCIIToUnicode.cpp \
 		nsVPSToUnicode.cpp \
 		nsUTF7ToUnicode.cpp \
 		nsMUTF7ToUnicode.cpp \
 		nsUCS2BEToUnicode.cpp \
 		nsT61ToUnicode.cpp \
@@ -146,17 +145,16 @@ CPPSRCS		= \
 		nsUnicodeToMacCyrillic.cpp \
 		nsUnicodeToMacIcelandic.cpp \
 		nsUnicodeToMacHebrew.cpp \
 		nsUnicodeToMacArabic.cpp \
 		nsUnicodeToMacDevanagari.cpp \
 		nsUnicodeToMacFarsi.cpp \
 		nsUnicodeToMacGujarati.cpp \
 		nsUnicodeToMacGurmukhi.cpp \
-		nsUnicodeToGEOSTD8.cpp \
 		nsUnicodeToARMSCII8.cpp \
 		nsUnicodeToTCVN5712.cpp \
 		nsUnicodeToVISCII.cpp \
 		nsUnicodeToVPS.cpp \
 		nsUnicodeToUTF7.cpp \
 		nsUnicodeToMUTF7.cpp \
 		nsUnicodeToUCS2BE.cpp \
 		nsUnicodeToT61.cpp \
deleted file mode 100644
--- a/intl/uconv/ucvlatin/geostd8.uf
+++ /dev/null
@@ -1,139 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Gia Shervashidze
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*========================================================
-  This is a Generated file. Please don't edit it.
-
-  The tool which used to generate this file is called fromu.
-  If you have any problem of this file. Please contact 
-  Netscape Client International Team or 
-  ftang@netscape <Frank Tang> 
-
-              Table in Debug form 
-Begin of Item 0000
- Format 0
-  srcBegin = 0000
-  srcEnd = 007F
-  destBegin = 0000
-End of Item 0000 
-
-Begin of Item 0001
- Format 0
-  srcBegin = 00A0
-  srcEnd = 00BF
-  destBegin = 00A0
-End of Item 0001 
-
-Begin of Item 0002
- Format 1
-  srcBegin = 10D0
-  srcEnd = 10F5
-  mappingOffset = 0000
- Mapping  = 
-  00C0 00C1 00C2 00C3 00C4 00C5 00C6 00C8
-  00C9 00CA 00CB 00CC 00CD 00CF 00D0 00D1
-  00D2 00D3 00D4 00D6 00D7 00D8 00D9 00DA
-  00DB 00DC 00DD 00DE 00DF 00E0 00E1 00E3
-  00E4 00C7 00CE 00D5 00E2 00E5
-End of Item 0002 
-
-Begin of Item 0003
- Format 1
-  srcBegin = 2013
-  srcEnd = 203A
-  mappingOffset = 0026
- Mapping  = 
-  0096 0097 FFFD FFFD FFFD 0091 0092 0082 
-  FFFD 0093 0094 0084 FFFD 0086 0087 0095 
-  FFFD FFFD FFFD 0085 FFFD FFFD FFFD FFFD 
-  FFFD FFFD FFFD FFFD FFFD 0089 FFFD FFFD 
-  FFFD FFFD FFFD FFFD FFFD FFFD 008B 009B 
-End of Item 0003 
-
-Begin of Item 0004
- Format 2
-  srcBegin = 20AC
-  destBegin = 0080
-End of Item 0004 
-
-Begin of Item 0005
- Format 2
-  srcBegin = 2116
-  destBegin = 00FD
-End of Item 0005 
-
-========================================================*/
-/* Offset=0x0000  ItemOfList */
-  0x0006,
-/*-------------------------------------------------------*/
-/* Offset=0x0001  offsetToFormatArray */
-  0x0004,
-/*-------------------------------------------------------*/
-/* Offset=0x0002  offsetToMapCellArray */ 
-  0x0006,
-/*-------------------------------------------------------*/
-/* Offset=0x0003  offsetToMappingTable */ 
-  0x0018,
-/*-------------------------------------------------------*/
-/*       Offset=0x0004   Start of Format Array */ 
-/*      Total of Format 0 : 0x0002                       */
-/*      Total of Format 1 : 0x0002                       */
-/*      Total of Format 2 : 0x0002                       */
-/*      Total of Format 3 : 0x0000                       */
-
-0x1100, 0x0022, 
-/*-------------------------------------------------------*/
-/*       Offset=0x0006   Start of MapCell Array */ 
-/* 0000 */    0x0000, 0x007F, 0x0000, 
-/* 0001 */    0x00A0, 0x00BF, 0x00A0, 
-/* 0002 */    0x10D0, 0x10F5, 0x0000, 
-/* 0003 */    0x2013, 0x203A, 0x0026, 
-/* 0004 */    0x20AC, 0x0000, 0x0080, 
-/* 0005 */    0x2116, 0x0000, 0x00FD, 
-/*-------------------------------------------------------*/
-/*       Offset=0x0018   Start of MappingTable */ 
-
-/* 0000 */    0x00C0, 0x00C1, 0x00C2, 0x00C3, 0x00C4, 0x00C5, 0x00C6, 0x00C8, 
-/* 0008 */    0x00C9, 0x00CA, 0x00CB, 0x00CC, 0x00CD, 0x00CF, 0x00D0, 0x00D1, 
-/* 0010 */    0x00D2, 0x00D3, 0x00D4, 0x00D6, 0x00D7, 0x00D8, 0x00D9, 0x00DA, 
-/* 0018 */    0x00DB, 0x00DC, 0x00DD, 0x00DE, 0x00DF, 0x00E0, 0x00E1, 0x00E3, 
-/* 0020 */    0x00E4, 0x00C7, 0x00CE, 0x00D5, 0x00E2, 0x00E5, 0x0096, 0x0097, 
-/* 0028 */    0xFFFD, 0xFFFD, 0xFFFD, 0x0091, 0x0092, 0x0082, 0xFFFD, 0x0093, 
-/* 0030 */    0x0094, 0x0084, 0xFFFD, 0x0086, 0x0087, 0x0095, 0xFFFD, 0xFFFD, 
-/* 0038 */    0xFFFD, 0x0085, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0040 */    0xFFFD, 0xFFFD, 0xFFFD, 0x0089, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0048 */    0xFFFD, 0x0085, 0xFFFD, 0xFFFD, 0x008B, 0x009B, 
-/*      End of table Total Length = 0x0066 * 2 */
deleted file mode 100644
--- a/intl/uconv/ucvlatin/geostd8.ut
+++ /dev/null
@@ -1,168 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Gia Shervashidze
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-/*========================================================
-  This is a Generated file. Please don't edit it.
-
-  The tool which used to generate this file is called umaptable.
-  You can find this tool under mozilla/intl/uconv/tools/umaptable.c.
-  If you have any problem of this file. Please contact 
-  Netscape Client International Team or 
-  ftang@netscape <Frank Tang> 
-
-              Table in Debug form 
-Begin of Item 0000
- Format 0
-  srcBegin = 0000
-  srcEnd = 007F
-  destBegin = 0000
-End of Item 0000 
-
-Begin of Item 0001
- Format 0
-  srcBegin = 00A0
-  srcEnd = 00BF
-  destBegin = 00A0
-End of Item 0001 
-
-Begin of Item 0002
- Format 0
-  srcBegin = 00C0
-  srcEnd = 00C6
-  destBegin = 10D0
-End of Item 0002 
-
-Begin of Item 0003
- Format 0
-  srcBegin = 00C8
-  srcEnd = 00CD
-  destBegin = 10D7
-End of Item 0003 
-
-Begin of Item 0004
- Format 0
-  srcBegin = 00CF
-  srcEnd = 00D4
-  destBegin = 10DD
-End of Item 0004 
-
-Begin of Item 0005
- Format 0
-  srcBegin = 00D6
-  srcEnd = 00E1
-  destBegin = 10E3
-End of Item 0005 
-
-Begin of Item 0006
- Format 1
-  srcBegin = 0080
-  srcEnd = 009B
-  mappingOffset = 0000
- Mapping  = 
-  20AC FFFD 201A FFFD 201E 2026 2020 2021 
-  FFFD 2030 FFFD 2039 FFFD FFFD FFFD FFFD 
-  FFFD 2018 2019 201C 201D 2022 2013 2014 
-  FFFD FFFD FFFD 203A 
-End of Item 0006 
-
-Begin of Item 0007
- Format 1
-  srcBegin = 00C7
-  srcEnd = 00D5
-  mappingOffset = 001C
- Mapping  = 
-  10F1 FFFD FFFD FFFD FFFD FFFD FFFD 10F2 
-  FFFD FFFD FFFD FFFD FFFD FFFD 10F3 
-End of Item 0007 
-
-Begin of Item 0008
- Format 1
-  srcBegin = 00E2
-  srcEnd = 00E5
-  mappingOffset = 002B
- Mapping  = 
-  10F4 10EF 10F0 10F5 
-End of Item 0008 
-
-Begin of Item 0009
- Format 2
-  srcBegin = 00FD
-  destBegin = 2116
-End of Item 0009 
-
-========================================================*/
-/* Offset=0x0000  ItemOfList */
-  0x000A,
-/*-------------------------------------------------------*/
-/* Offset=0x0001  offsetToFormatArray */
-  0x0004,
-/*-------------------------------------------------------*/
-/* Offset=0x0002  offsetToMapCellArray */ 
-  0x0007,
-/*-------------------------------------------------------*/
-/* Offset=0x0003  offsetToMappingTable */ 
-  0x0025,
-/*-------------------------------------------------------*/
-/*       Offset=0x0004   Start of Format Array */ 
-/*	Total of Format 0 : 0x0006			 */
-/*	Total of Format 1 : 0x0003			 */
-/*	Total of Format 2 : 0x0001			 */
-/*	Total of Format 3 : 0x0000			 */
-
-0x0000, 0x1100, 0x0021, 
-/*-------------------------------------------------------*/
-/*       Offset=0x0007   Start of MapCell Array */ 
-/* 0000 */    0x0000, 0x007F, 0x0000, 
-/* 0001 */    0x00A0, 0x00BF, 0x00A0, 
-/* 0002 */    0x00C0, 0x00C6, 0x10D0, 
-/* 0003 */    0x00C8, 0x00CD, 0x10D7, 
-/* 0004 */    0x00CF, 0x00D4, 0x10DD, 
-/* 0005 */    0x00D6, 0x00E1, 0x10E3, 
-/* 0006 */    0x0080, 0x009B, 0x0000, 
-/* 0007 */    0x00C7, 0x00D5, 0x001C, 
-/* 0008 */    0x00E2, 0x00E5, 0x002B, 
-/* 0009 */    0x00FD, 0x0000, 0x2116, 
-/*-------------------------------------------------------*/
-/*       Offset=0x0025   Start of MappingTable */ 
-
-/* 0000 */    0x20AC, 0xFFFD, 0x201A, 0xFFFD, 0x201E, 0x2026, 0x2020, 0x2021, 
-/* 0008 */    0xFFFD, 0x2030, 0xFFFD, 0x2039, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0010 */    0xFFFD, 0x2018, 0x2019, 0x201C, 0x201D, 0x2022, 0x2013, 0x2014, 
-/* 0018 */    0xFFFD, 0xFFFD, 0xFFFD, 0x203A, 0x10F1, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0020 */    0xFFFD, 0xFFFD, 0xFFFD, 0x10F2, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD, 
-/* 0028 */    0xFFFD, 0xFFFD, 0x10F3, 0x10F4, 0x10EF, 0x10F0, 0x10F5, 
-/*	End of table Total Length = 0x0054 * 2 */
deleted file mode 100644
--- a/intl/uconv/ucvlatin/nsGEOSTD8ToUnicode.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsUCConstructors.h"
-#include "nsGEOSTD8ToUnicode.h"
-
-//----------------------------------------------------------------------
-// Global functions and data [declaration]
-
-static const PRUint16 g_utMappingTable[] = {
-#include "geostd8.ut"
-};
-
-nsresult
-nsGEOSTD8ToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
-                              void **aResult) 
-{
-  return CreateOneByteDecoder((uMappingTable*) &g_utMappingTable,
-                              aOuter, aIID, aResult);
-}
-
deleted file mode 100644
--- a/intl/uconv/ucvlatin/nsGEOSTD8ToUnicode.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsGEOSTD8ToUnicode_h___
-#define nsGEOSTD8ToUnicode_h___
-
-#include "nsISupports.h"
-
-/**
- * A character set converter from GEOSTD8 to Unicode.
- *
- */
-nsresult
-nsGEOSTD8ToUnicodeConstructor(nsISupports *aOuter, REFNSIID aIID,
-                            void **aResult);
-
-#endif /* nsGEOSTD8ToUnicode_h___ */
--- a/intl/uconv/ucvlatin/nsUCvLatinCID.h
+++ b/intl/uconv/ucvlatin/nsUCvLatinCID.h
@@ -196,21 +196,16 @@
 #define NS_MACCYRILLICTOUNICODE_CID \
   { 0x6394eea9, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
 // Class ID for our MacIcelandicToUnicode charset converter
 // {6394EEAB-FC3D-11d2-B3B8-00805F8A6670}
 #define NS_MACICELANDICTOUNICODE_CID \
   { 0x6394eeab, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
-// Class ID for our GEOSTD8ToUnicode charset converter
-// {6394EEAF-FC3D-11d2-B3B8-00805F8A6670}
-#define NS_GEOSTD8TOUNICODE_CID \
-  { 0x6394eeaf, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
-
 // Class ID for our ARMSCII8ToUnicode charset converter
 // {6394EEAC-FC3D-11d2-B3B8-00805F8A6670}
 #define NS_ARMSCII8TOUNICODE_CID \
   { 0x6394eeac, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
 // Class ID for our TCVN5712ToUnicode charset converter
 // {6394EEAD-FC3D-11d2-B3B8-00805F8A6670}
 #define NS_TCVN5712TOUNICODE_CID \
@@ -392,21 +387,16 @@
 #define NS_UNICODETOMACCYRILLIC_CID \
   { 0x6394eeb9, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
 // Class ID for our UnicodeToMacIcelandic charset converter
 // {6394EEBB-FC3D-11d2-B3B8-00805F8A6670}
 #define NS_UNICODETOMACICELANDIC_CID \
   { 0x6394eebb, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
-// Class ID for our UnicodeToGEOSTD8 charset converter
-// {6394EEBE-FC3D-11d2-B3B8-00805F8A6670}
-#define NS_UNICODETOGEOSTD8_CID \
-  { 0x6394eebe, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
-
 // Class ID for our UnicodeToARMSCII8 charset converter
 // {6394EEBC-FC3D-11d2-B3B8-00805F8A6670}
 #define NS_UNICODETOARMSCII8_CID \
   { 0x6394eebc, 0xfc3d, 0x11d2, {0xb3, 0xb8, 0x0, 0x80, 0x5f, 0x8a, 0x66, 0x70}}
 
 // Class ID for our UnicodeToTCVN5712 charset converter
 // {6394EEBD-FC3D-11d2-B3B8-00805F8A6670}
 #define NS_UNICODETOTCVN5712_CID \
deleted file mode 100644
--- a/intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsUCConstructors.h"
-#include "nsUnicodeToGEOSTD8.h"
-
-//----------------------------------------------------------------------
-// Global functions and data [declaration]
-
-static const PRUint16 g_ufMappingTable[] = {
-#include "geostd8.uf"
-};
-
-nsresult
-nsUnicodeToGEOSTD8Constructor(nsISupports *aOuter, REFNSIID aIID,
-                              void **aResult) 
-{
-  return CreateTableEncoder(u1ByteCharset,
-                            (uMappingTable*) &g_ufMappingTable, 1,
-                            aOuter, aIID, aResult);
-}
deleted file mode 100644
--- a/intl/uconv/ucvlatin/nsUnicodeToGEOSTD8.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsUnicodeToGEOSTD8_h___
-#define nsUnicodeToGEOSTD8_h___
-
-#include "nsISupports.h"
-
-/**
- * A character set converter from Unicode to GEOSTD8.
- *
- */
-nsresult
-nsUnicodeToGEOSTD8Constructor(nsISupports *aOuter, REFNSIID aIID,
-                              void **aResult);
-
-#endif /* nsUnicodeToGEOSTD8_h___ */
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1102,17 +1102,17 @@ pref("converter.html2txt.header_strategy
 
 pref("intl.accept_languages",               "chrome://global/locale/intl.properties");
 pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
 pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
 pref("intl.charsetmenu.browser.static",     "chrome://global/locale/intl.properties");
 pref("intl.charsetmenu.browser.more1",      "ISO-8859-1, ISO-8859-15, IBM850, x-mac-roman, windows-1252, ISO-8859-14, ISO-8859-7, x-mac-greek, windows-1253, x-mac-icelandic, ISO-8859-10, ISO-8859-3");
 pref("intl.charsetmenu.browser.more2",      "ISO-8859-4, ISO-8859-13, windows-1257, IBM852, ISO-8859-2, x-mac-ce, windows-1250, x-mac-croatian, IBM855, ISO-8859-5, ISO-IR-111, KOI8-R, x-mac-cyrillic, windows-1251, IBM866, KOI8-U, x-mac-ukrainian, ISO-8859-16, x-mac-romanian");
 pref("intl.charsetmenu.browser.more3",      "GB2312, gbk, gb18030, HZ-GB-2312, ISO-2022-CN, Big5, Big5-HKSCS, x-euc-tw, EUC-JP, ISO-2022-JP, Shift_JIS, EUC-KR, x-windows-949, x-johab, ISO-2022-KR");
-pref("intl.charsetmenu.browser.more4",      "armscii-8, GEOSTD8, TIS-620, ISO-8859-11, windows-874, IBM857, ISO-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, VISCII, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi");
+pref("intl.charsetmenu.browser.more4",      "armscii-8, TIS-620, ISO-8859-11, windows-874, IBM857, ISO-8859-9, x-mac-turkish, windows-1254, x-viet-tcvn5712, VISCII, x-viet-vps, windows-1258, x-mac-devanagari, x-mac-gujarati, x-mac-gurmukhi");
 pref("intl.charsetmenu.browser.more5",      "ISO-8859-6, windows-1256, IBM864, ISO-8859-8-I, windows-1255, ISO-8859-8, IBM862");
 pref("intl.charsetmenu.browser.unicode",    "UTF-8, UTF-16LE, UTF-16BE");
 pref("intl.charsetmenu.mailedit",           "chrome://global/locale/intl.properties");
 pref("intl.charsetmenu.browser.cache",      "");
 pref("intl.charsetmenu.mailview.cache",     "");
 pref("intl.charsetmenu.composer.cache",     "");
 pref("intl.charsetmenu.browser.cache.size", 5);
 pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
--- a/toolkit/locales/en-US/chrome/global/intl.properties
+++ b/toolkit/locales/en-US/chrome/global/intl.properties
@@ -20,13 +20,13 @@ pluralRule=1
 font.language.group=x-western
 # Localization Note: Add the code for your language at the front of this entry,
 # leaving "en-us, en" for fallback. It's recommended to use the same form, e.g.
 # "ja-jp, ja, en-us, en"
 intl.accept_languages=en-us, en
 intl.charsetmenu.browser.static=ISO-8859-1, UTF-8
 intl.charset.default=ISO-8859-1
 intl.charset.detector=
-intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, geostd8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
+intl.charsetmenu.mailedit=ISO-8859-1, ISO-8859-15, ISO-8859-6, armscii-8, ISO-8859-13, ISO-8859-14, ISO-8859-2, GB2312, GB18030, Big5, KOI8-R, windows-1251, KOI8-U, ISO-8859-7, ISO-8859-8-I, windows-1255, ISO-2022-JP, EUC-KR, ISO-8859-10, ISO-8859-3, TIS-620, ISO-8859-9, UTF-8, VISCII
 # valid intl.menuitems.appendedacceskeys are: true or false, <empty string> (missing or empty preference equals false)
 intl.menuitems.alwaysappendaccesskeys=
 # valid intl.menuitems.insertseparatorbeforeaccesskeys are: true or false, <empty string> (missing or empty preference equals false)
 intl.menuitems.insertseparatorbeforeaccesskeys=true