Bug 1031314: Remove Yahoo! JAPAN support from JS-Yahoo. r=clokep
authorQuentin Headen <qheaden@phaseshiftsoftware.com>
Fri, 27 Jun 2014 10:11:49 -0400
changeset 20433 ae54459b97a507163e4c5f43bedab73cb0641620
parent 20432 de14c1c218bcb58ae98f448265da77f9ccf3c0fb
child 20434 bf0b3a46206401f0f5066ea7770cf605dc82e6c9
push id1209
push usermbanner@mozilla.com
push dateTue, 02 Sep 2014 16:59:36 +0000
treeherdercomm-beta@842e0fd167ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersclokep
bugs1031314
Bug 1031314: Remove Yahoo! JAPAN support from JS-Yahoo. r=clokep
chat/protocols/yahoo/jar.mn
chat/protocols/yahoo/yahoo.js
chat/protocols/yahoo/yahoo.manifest
--- a/chat/protocols/yahoo/jar.mn
+++ b/chat/protocols/yahoo/jar.mn
@@ -1,10 +1,9 @@
 # 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/.
 
 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)
 	skin/classic/prpl/yahoo/icon.png	(icons/prpl-yahoo.png)
--- a/chat/protocols/yahoo/yahoo.js
+++ b/chat/protocols/yahoo/yahoo.js
@@ -583,35 +583,9 @@ YahooProtocol.prototype = {
         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]);
--- 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