commit d699acc2ac143a01e6ae6946c3ff4325e0bf2604 Author: Sukhbir Singh sukhbir@torproject.org Date: Sat Dec 20 01:12:21 2014 +0530

Do not set any XMPP resource (#13994) --- 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 7eab581..9ca0c19 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -63,6 +63,7 @@ input_files: - filename: slashme.patch - filename: irc.patch - filename: xmpp.patch + - filename: xmpp-resource.patch - filename: facebook.patch - filename: accountcreation.patch - filename: links.patch diff --git a/projects/instantbird/xmpp-resource.patch b/projects/instantbird/xmpp-resource.patch new file mode 100644 index 0000000..f71a830 --- /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 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"),