[tor-commits] [tor-messenger-build/master] Force set the resource to "Instantbird"

[sukhbir at torproject.org]

commit a428310319310d62ca4681244d625187b6ba3f02
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Fri May 8 10:45:02 2015 -0400

    Force set the resource to "Instantbird"
    
    The default resource is determined by the brand name, which in our case
    is "Tor Messenger". We are pretending to be "Instantbird" so override
    the default resource.
---
 projects/instantbird/config              |    1 +
 projects/instantbird/xmpp-resource.patch |   13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 06c4cbe..3e25e50 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -70,6 +70,7 @@ input_files:
   - filename: ctcp-time.patch
   - filename: ctcp-ping.patch
   - filename: xmpp-onion.patch
+  - filename: xmpp-resource.patch
   - filename: version.patch
   - filename: branding/name.patch
   - filename: branding/default.png
diff --git a/projects/instantbird/xmpp-resource.patch b/projects/instantbird/xmpp-resource.patch
new file mode 100644
index 0000000..3e861da
--- /dev/null
+++ b/projects/instantbird/xmpp-resource.patch
@@ -0,0 +1,13 @@
+diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js
+index f99a238..a35f99a 100644
+--- a/chat/protocols/xmpp/xmpp.js
++++ b/chat/protocols/xmpp/xmpp.js
+@@ -34,7 +34,7 @@ XMPPProtocol.prototype = {
+ 
+   options: {
+     resource: {get label() _("options.resource"),
+-               get default() XMPPDefaultResource},
++               default: "Instantbird"},
+     priority: {get label() _("options.priority"), default: 0},
+     connection_security: {
+       get label() _("options.connectionSecurity"),