Bug 955587 - Remove VKontakte protocol, r=florian.
--- a/chat/locales/en-US/xmpp.properties
+++ b/chat/locales/en-US/xmpp.properties
@@ -71,28 +71,21 @@ options.connectionSecurity.requireEncryp
options.connectionSecurity.opportunisticTLS=Use encryption if available
options.connectionSecurity.allowUnencryptedAuth=Allow sending the password unencrypted
options.connectServer=Server
options.connectPort=Port
# LOCALIZATION NOTE (*.protocolName)
# This name is used whenever the name of the protocol is shown.
gtalk.protocolName=Google Talk
-vkontakte.protocolName=VK
odnoklassniki.protocolName=Odnoklassniki
# LOCALIZATION NOTE (gtalk.usernameHint):
# This is displayed inside the accountUsernameInfoWithDescription
# string defined in imAccounts.properties when the user is
# configuring a Google Talk account.
gtalk.usernameHint=email address
-# LOCALIZATION NOTE (vkontakte.usernameHint):
-# This is displayed inside the accountUsernameInfoWithDescription
-# string defined in imAccounts.properties when the user is
-# configuring a Vkontakte account.
-vkontakte.usernameHint=Profile ID
-
# LOCALIZATION NOTE (odnoklassniki.usernameHint):
# This is displayed inside the accountUsernameInfoWithDescription
# string defined in imAccounts.properties when the user is
# configuring a Odnoklassniki account.
odnoklassniki.usernameHint=Profile ID
--- a/chat/moz.build
+++ b/chat/moz.build
@@ -10,15 +10,14 @@ PARALLEL_DIRS += [
'content',
'themes',
'locales',
'protocols/facebook',
'protocols/gtalk',
'protocols/irc',
'protocols/odnoklassniki',
'protocols/twitter',
- 'protocols/vkontakte',
'protocols/xmpp',
'protocols/yahoo',
]
if CONFIG['MOZ_DEBUG']:
PARALLEL_DIRS += ['protocols/jsTest']
deleted file mode 100644
--- a/chat/protocols/vkontakte/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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/.
-
-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-EXTRA_COMPONENTS = \
- vkontakte.js \
- vkontakte.manifest \
- $(NULL)
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
index cf6fdbd1f3675b62192896b2bd87eaa964a615ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 31c84f0346d2b43e5b869d9f7fb6135db59cfabe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 0090596606ffd2f630491a6ed142975c540ae899..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
--- a/chat/protocols/vkontakte/jar.mn
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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-vkontakte classic/1.0 %skin/classic/prpl/vkontakte/
- skin/classic/prpl/vkontakte/icon32.png (icons/prpl-vkontakte-32.png)
- skin/classic/prpl/vkontakte/icon48.png (icons/prpl-vkontakte-48.png)
- skin/classic/prpl/vkontakte/icon.png (icons/prpl-vkontakte.png)
deleted file mode 100644
--- a/chat/protocols/vkontakte/moz.build
+++ /dev/null
@@ -1,4 +0,0 @@
-# vim: set filetype=python:
-# 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/.
deleted file mode 100644
--- a/chat/protocols/vkontakte/vkontakte.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* 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/. */
-
-const {interfaces: Ci, utils: Cu} = Components;
-
-Cu.import("resource:///modules/imXPCOMUtils.jsm");
-Cu.import("resource:///modules/jsProtoHelper.jsm");
-Cu.import("resource:///modules/xmpp.jsm");
-Cu.import("resource:///modules/xmpp-session.jsm");
-
-XPCOMUtils.defineLazyGetter(this, "_", function()
- l10nHelper("chrome://chat/locale/xmpp.properties")
-);
-
-function VkontakteAccount(aProtoInstance, aImAccount) {
- this._init(aProtoInstance, aImAccount);
-}
-VkontakteAccount.prototype = {
- __proto__: XMPPAccountPrototype,
- get canJoinChat() false,
- connect: function() {
- if (!this.name.contains("@")) {
- let jid = this.name + "@vk.com/" + XMPPDefaultResource;
- this._jid = this._parseJID(jid);
- }
- else {
- this._jid = this._parseJID(this.name);
- if (this._jid.domain != "vk.com") {
- // We can't use this.onError because this._connection doesn't exist.
- this.reportDisconnecting(Ci.prplIAccount.ERROR_INVALID_USERNAME,
- _("connection.error.invalidUsername"));
- this.reportDisconnected();
- return;
- }
- }
-
- this._connection = new XMPPSession("vkmessenger.com", 5222,
- "require_tls", this._jid,
- this.imAccount.password, this);
- }
-};
-
-function VkontakteProtocol() {
-}
-VkontakteProtocol.prototype = {
- __proto__: GenericProtocolPrototype,
- get normalizedName() "vkontakte",
- get name() _("vkontakte.protocolName"),
- get iconBaseURI() "chrome://prpl-vkontakte/skin/",
- get usernameEmptyText() _("vkontakte.usernameHint"),
- getAccount: function(aImAccount) new VkontakteAccount(this, aImAccount),
- classID: Components.ID("{0743ab81-8963-1743-7abc-9874823acd56}")
-};
-
-const NSGetFactory = XPCOMUtils.generateNSGetFactory([VkontakteProtocol]);
deleted file mode 100644
--- a/chat/protocols/vkontakte/vkontakte.manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-component {0743ab81-8963-1743-7abc-9874823acd56} vkontakte.js
-contract @mozilla.org/chat/vkontakte;1 {0743ab81-8963-1743-7abc-9874823acd56}
-category im-protocol-plugin prpl-vkontakte @mozilla.org/chat/vkontakte;1