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

[sukhbir at torproject.org]

commit d47ddb52bf292f0faa85ceba5d2f789d212c7c6b
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Wed Jul 15 23:34:26 2015 -0400

    Update XMPP patches
    
    Remove obsolete patch for username split merged upstream and update existing
    patch for setting default XMPP domain.
---
 projects/instantbird/config                    |    3 +--
 projects/instantbird/xmpp-default-domain.patch |   22 ++++++++++++++++++++++
 projects/instantbird/xmpp-domain.patch         |   11 -----------
 projects/instantbird/xmpp-username-split.patch |   16 ----------------
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index ea9603f..9cd0343 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -78,11 +78,10 @@ input_files:
   - filename: ctcp-time.patch
   - filename: ctcp-ping.patch
   - filename: xmpp-inband-registration.patch
+  - filename: xmpp-default-domain.patch
   - filename: xmppRegister.js
   - filename: xmppRegister.xul
-  - filename: xmpp-domain.patch
   - filename: xmpp-resource.patch
-  - filename: xmpp-username-split.patch
   - filename: version.patch
   - filename: search-context-menu.patch
   - filename: search-preferences-xul.patch
diff --git a/projects/instantbird/xmpp-default-domain.patch b/projects/instantbird/xmpp-default-domain.patch
new file mode 100644
index 0000000..f9480f0
--- /dev/null
+++ b/projects/instantbird/xmpp-default-domain.patch
@@ -0,0 +1,22 @@
+diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js
+--- a/chat/protocols/xmpp/xmpp.js
++++ b/chat/protocols/xmpp/xmpp.js
+@@ -24,17 +24,17 @@ XMPPProtocol.prototype = {
+   __proto__: GenericProtocolPrototype,
+   get normalizedName() "jabber",
+   get name() "XMPP",
+   get iconBaseURI() "chrome://prpl-jabber/skin/",
+   getAccount: function(aImAccount) new XMPPAccount(this, aImAccount),
+ 
+   usernameSplits: [
+     {get label() _("options.domain"), separator: "@",
+-     defaultValue: "jabber.org", reverse: true}
++     defaultValue: "", reverse: true}
+   ],
+ 
+   options: {
+     resource: {get label() _("options.resource"),
+                get default() XMPPDefaultResource},
+     priority: {get label() _("options.priority"), default: 0},
+     connection_security: {
+       get label() _("options.connectionSecurity"),
diff --git a/projects/instantbird/xmpp-domain.patch b/projects/instantbird/xmpp-domain.patch
deleted file mode 100644
index a7d94a4..0000000
--- a/projects/instantbird/xmpp-domain.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/chat/locales/en-US/xmpp.properties b/chat/locales/en-US/xmpp.properties
---- a/chat/locales/en-US/xmpp.properties
-+++ b/chat/locales/en-US/xmpp.properties
-@@ -79,6 +79,7 @@
- options.connectionSecurity.allowUnencryptedAuth=Allow sending the password unencrypted
- options.connectServer=Server
- options.connectPort=Port
-+options.domain=Domain
- 
- # LOCALIZATION NOTE (*.protocolName)
- #  This name is used whenever the name of the protocol is shown.
diff --git a/projects/instantbird/xmpp-username-split.patch b/projects/instantbird/xmpp-username-split.patch
deleted file mode 100644
index f551699..0000000
--- a/projects/instantbird/xmpp-username-split.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js
---- a/chat/protocols/xmpp/xmpp.js
-+++ b/chat/protocols/xmpp/xmpp.js
-@@ -26,6 +26,12 @@
-   get name() "XMPP",
-   get iconBaseURI() "chrome://prpl-jabber/skin/",
-   getAccount: function(aImAccount) new XMPPAccount(this, aImAccount),
-+
-+  usernameSplits: [
-+    {get label() _("options.domain"), separator: "@",
-+     defaultValue: "", reverse: true}
-+  ],
-+
-   options: {
-     resource: {get label() _("options.resource"),
-                get default() XMPPDefaultResource},