commit 2e91d193667a3843fb338b4c084899b48705160a Author: Sukhbir Singh sukhbir@torproject.org Date: Wed Sep 30 06:36:41 2015 -0400

Update IRC, XMPP and Gtalk patches --- projects/instantbird/irc-default-server.patch | 5 ++--- projects/instantbird/xmpp-default-domain.patch | 5 ++--- projects/instantbird/xmpp-gtalk-resource.patch | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/projects/instantbird/irc-default-server.patch b/projects/instantbird/irc-default-server.patch index 9ad53b0..32b06d5 100644 --- a/projects/instantbird/irc-default-server.patch +++ b/projects/instantbird/irc-default-server.patch @@ -1,11 +1,10 @@ diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js -index fc90494..d546b6b 100644 --- a/chat/protocols/irc/irc.js +++ b/chat/protocols/irc/irc.js -@@ -1960,7 +1960,7 @@ ircProtocol.prototype = { +@@ -1959,7 +1959,7 @@

usernameSplits: [ - {get label() { return _("options.server"); }, separator: "@", + {get label() _("options.server"), separator: "@", - defaultValue: "chat.freenode.net", reverse: true} + defaultValue: "", reverse: true} ], diff --git a/projects/instantbird/xmpp-default-domain.patch b/projects/instantbird/xmpp-default-domain.patch index d2ebe9c..d9d6d1e 100644 --- a/projects/instantbird/xmpp-default-domain.patch +++ b/projects/instantbird/xmpp-default-domain.patch @@ -1,11 +1,10 @@ diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js -index f7dfc46..c2c3a09 100644 --- a/chat/protocols/xmpp/xmpp.js +++ b/chat/protocols/xmpp/xmpp.js -@@ -31,7 +31,7 @@ XMPPProtocol.prototype = { +@@ -31,7 +31,7 @@

usernameSplits: [ - {get label() { return _("options.domain"); }, separator: "@", + {get label() _("options.domain"), separator: "@", - defaultValue: "jabber.org", reverse: true} + defaultValue: "", reverse: true} ], diff --git a/projects/instantbird/xmpp-gtalk-resource.patch b/projects/instantbird/xmpp-gtalk-resource.patch index 1318eb5..e9432e4 100644 --- a/projects/instantbird/xmpp-gtalk-resource.patch +++ b/projects/instantbird/xmpp-gtalk-resource.patch @@ -1,14 +1,14 @@ diff --git a/chat/protocols/gtalk/gtalk.js b/chat/protocols/gtalk/gtalk.js --- a/chat/protocols/gtalk/gtalk.js +++ b/chat/protocols/gtalk/gtalk.js -@@ -96,7 +96,7 @@ - getAccount: function(aImAccount) { return new GTalkAccount(this, aImAccount); }, +@@ -95,7 +95,7 @@ + getAccount: function(aImAccount) new GTalkAccount(this, aImAccount), options: { - resource: {get label() { return _("options.resource"); }, -- get default() { return XMPPDefaultResource; }} + resource: {get label() _("options.resource"), +- get default() XMPPDefaultResource} + default: "Instantbird"}, }, - get chatHasTopic() { return true; }, + get chatHasTopic() true, classID: Components.ID("{38a224c1-6748-49a9-8ab2-efc362b1000d}") diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js --- a/chat/protocols/xmpp/xmpp.js @@ -16,9 +16,9 @@ diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js @@ -36,7 +36,7 @@

options: { - resource: {get label() { return _("options.resource"); }, -- get default() { return XMPPDefaultResource; }}, -+ default: "Instanbird"}, - priority: {get label() { return _("options.priority"); }, default: 0}, + resource: {get label() _("options.resource"), +- get default() XMPPDefaultResource}, ++ default: "Instantbird"}, + priority: {get label() _("options.priority"), default: 0}, connection_security: { - get label() { return _("options.connectionSecurity"); }, + get label() _("options.connectionSecurity"),