[tor-commits] [tor-messenger-build/master] Remove the resource field for Google Talk

[sukhbir at torproject.org]

commit 41aa904ae61fb31560792e157b3eec6cde418473
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Mon Feb 2 16:04:03 2015 +0530

    Remove the resource field for Google Talk
---
 projects/instantbird/config               |    1 +
 projects/instantbird/gtalk-resource.patch |   13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 10e8fbb..f4ca296 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -62,6 +62,7 @@ input_files:
   - filename: irc.patch
   - filename: xmpp.patch
   - filename: xmpp-resource.patch
+  - filename: gtalk-resource.patch
   - filename: accountcreation.patch
   - filename: links.patch
   - filename: picture.patch
diff --git a/projects/instantbird/gtalk-resource.patch b/projects/instantbird/gtalk-resource.patch
new file mode 100644
index 0000000..59006ee
--- /dev/null
+++ b/projects/instantbird/gtalk-resource.patch
@@ -0,0 +1,13 @@
+diff --git a/chat/protocols/gtalk/gtalk.js b/chat/protocols/gtalk/gtalk.js
+index 56c6c72..1e1ead5 100644
+--- a/chat/protocols/gtalk/gtalk.js
++++ b/chat/protocols/gtalk/gtalk.js
+@@ -93,7 +93,7 @@ GTalkProtocol.prototype = {
+   getAccount: function(aImAccount) new GTalkAccount(this, aImAccount),
+   options: {
+     resource: {get label() _("options.resource"),
+-               get default() XMPPDefaultResource}
++               default: ""}
+   },
+   get chatHasTopic() true,
+   classID: Components.ID("{38a224c1-6748-49a9-8ab2-efc362b1000d}")