# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1425038318 -32400
# Branch GECKO3170_2015050714_RELBRANCH
# Node ID d3dbf3141336924a003d06c3eb046d0a97794877
# Parent  ad0022063ec30e586024f4e840c3421e163a5247
Yahoo!JAPAN Messenger service has ended

diff --git a/chat/protocols/yahoo/yahoo.js b/chat/protocols/yahoo/yahoo.js
--- a/chat/protocols/yahoo/yahoo.js
+++ b/chat/protocols/yahoo/yahoo.js
@@ -573,35 +573,9 @@
         return true;
       }
     }
   ],
   getAccount: function(aImAccount) new YahooAccount(this, aImAccount),
   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]);
diff --git a/chat/protocols/yahoo/yahoo.manifest b/chat/protocols/yahoo/yahoo.manifest
--- a/chat/protocols/yahoo/yahoo.manifest
+++ b/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
