[tor-commits] [tor-messenger-build/master] Remove xmpp.patch (#15149, #15162)

[sukhbir at torproject.org]

commit fa7fc03cb285173bbf3973547d0d6b45cfa2161b
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Fri May 8 00:25:07 2015 -0400

    Remove xmpp.patch (#15149, #15162)
    
    xmpp.patch was doing two things: setting the default server to
    jabber.ccc.de, and setting the XMPP resource to an empty string. #15149
    lists the reasons why we shouldn't use jabber.ccc.de as the default
    server, and since we are no longer pretending not to be Instantbird, we
    should not clear the resource (#15162).
---
 projects/instantbird/xmpp.patch |   28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/projects/instantbird/xmpp.patch b/projects/instantbird/xmpp.patch
deleted file mode 100644
index 593966c..0000000
--- a/projects/instantbird/xmpp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js
-index f99a238..bc787c9 100644
---- a/chat/protocols/xmpp/xmpp.js
-+++ b/chat/protocols/xmpp/xmpp.js
-@@ -29,12 +29,12 @@ XMPPProtocol.prototype = {
- 
-   usernameSplits: [
-     {get label() _("options.domain"), separator: "@",
--     defaultValue: "jabber.org", reverse: true}
-+     defaultValue: "jabber.ccc.de", reverse: true}
-   ],
- 
-   options: {
-     resource: {get label() _("options.resource"),
--               get default() XMPPDefaultResource},
-+               default: ""},
-     priority: {get label() _("options.priority"), default: 0},
-     connection_security: {
-       get label() _("options.connectionSecurity"),
-@@ -47,7 +47,7 @@ XMPPProtocol.prototype = {
-       },
-       default: "require_tls"
-     },
--    server: {get label() _("options.connectServer"), default: ""},
-+    server: {get label() _("options.connectServer"), default: "jabber.ccc.de"},
-     port: {get label() _("options.connectPort"), default: 5222}
-   },
-   get chatHasTopic() true,