[tor-commits] [tor-messenger-build/master] Update the XMPP patches

[sukhbir at torproject.org]

commit d8c9f5ec184065ca9aafe41c041303dcc918aef1
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Tue Mar 10 20:57:19 2015 +0530

    Update the XMPP patches
    
    Merge all XMPP patches into a single patch and set the default Jabber
    domain to jabber.ccc.de.
---
 projects/instantbird/config              |    1 -
 projects/instantbird/xmpp-resource.patch |   13 -------------
 projects/instantbird/xmpp.patch          |   19 +++++++++++++++++--
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index e50111a..939faf7 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -60,7 +60,6 @@ input_files:
   - filename: preferences.patch
   - filename: irc.patch
   - filename: xmpp.patch
-  - filename: xmpp-resource.patch
   - filename: gtalk-resource.patch
   - filename: accountcreation.patch
   - filename: links.patch
diff --git a/projects/instantbird/xmpp-resource.patch b/projects/instantbird/xmpp-resource.patch
deleted file mode 100644
index f71a830..0000000
--- a/projects/instantbird/xmpp-resource.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js
-index f125b20..5104bd6 100644
---- a/chat/protocols/xmpp/xmpp.js
-+++ b/chat/protocols/xmpp/xmpp.js
-@@ -28,7 +28,7 @@ XMPPProtocol.prototype = {
-   getAccount: function(aImAccount) new XMPPAccount(this, aImAccount),
-   options: {
-     resource: {get label() _("options.resource"),
--               get default() XMPPDefaultResource},
-+               default: ""},
-     priority: {get label() _("options.priority"), default: 0},
-     connection_security: {
-       get label() _("options.connectionSecurity"),
diff --git a/projects/instantbird/xmpp.patch b/projects/instantbird/xmpp.patch
index 38cd4a3..593966c 100644
--- a/projects/instantbird/xmpp.patch
+++ b/projects/instantbird/xmpp.patch
@@ -1,8 +1,23 @@
 diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js
-index b05c77e..f8c829f 100644
+index f99a238..bc787c9 100644
 --- a/chat/protocols/xmpp/xmpp.js
 +++ b/chat/protocols/xmpp/xmpp.js
-@@ -41,7 +41,7 @@ XMPPProtocol.prototype = {
+@@ -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"
      },