Bug 1031314: Remove Yahoo! JAPAN support from JS-Yahoo. r=clokep

chat/protocols/yahoo/jar.mn

@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 chat.jar:
-% skin prpl-yahoojp classic/1.0 %skin/classic/prpl/yahoo/
 % skin prpl-yahoo classic/1.0 %skin/classic/prpl/yahoo/
 	skin/classic/prpl/yahoo/icon32.png	(icons/prpl-yahoo-32.png)
 	skin/classic/prpl/yahoo/icon48.png	(icons/prpl-yahoo-48.png)

chat/protocols/yahoo/yahoo.js

@@ -588,30 +588,4 @@ YahooProtocol.prototype = {
   classID: Components.ID("{50ea817e-5d79-4657-91ae-aa0a52bdb98c}")
 };
 
-function YahooJapanProtocol() {
-  this.registerCommands();
-}
-YahooJapanProtocol.prototype = {
-  __proto__: YahooProtocol.prototype,
-  // Protocol specific connection parameters.
-  pagerRequestUrl: "http://cs1.yahoo.co.jp/capacity",
-  loginTokenGetUrl: "https://login.yahoo.co.jp/config/pwtoken_get",
-  loginTokenLoginUrl: "https://login.yahoo.co.jp/config/pwtoken_login",
-  buildId: "4186047",
-
-  get id() "prpl-yahoojp",
-  get name() "Yahoo JAPAN",
-  get iconBaseURI() "chrome://prpl-yahoojp/skin/",
-  options: {
-    port: {get label() _("options.pagerPort"), default: 5050},
-    xfer_host: {get label() _("options.transferHost"), default: "filetransfer.msg.yahoo.com"},
-    xfer_port: {get label() _("options.transferPort"), default: 80},
-    //room_list_locale: {get label() _("options.chatLocale"), default: "jp"},
-    local_charset: {get label() _("options.chatEncoding"), default: "UTF-8"},
-    ignore_invites: {get label() _("options.ignoreInvites"), default: false}
-    //proxy_ssl: {get label() _("options.proxySSL"), default: false}
-  },
-  classID: Components.ID("{5f6dc733-ec0d-4de8-8adc-e4967064ed38}")
-};
-
-const NSGetFactory = XPCOMUtils.generateNSGetFactory([YahooProtocol, YahooJapanProtocol]);
+const NSGetFactory = XPCOMUtils.generateNSGetFactory([YahooProtocol]);

chat/protocols/yahoo/yahoo.manifest

@@ -1,7 +1,3 @@
 component {50ea817e-5d79-4657-91ae-aa0a52bdb98c} yahoo.js
 contract @mozilla.org/chat/yahoo;1 {50ea817e-5d79-4657-91ae-aa0a52bdb98c}
 category im-protocol-plugin prpl-yahoo @mozilla.org/chat/yahoo;1
-
-component {5f6dc733-ec0d-4de8-8adc-e4967064ed38} yahoo.js
-contract @mozilla.org/chat/yahoojp;1 {5f6dc733-ec0d-4de8-8adc-e4967064ed38}
-category im-protocol-plugin prpl-yahoojp @mozilla.org/chat/yahoojp;1