[tor-commits] [tor-messenger-build/master] Rebase xmpp-gtalk-resource.patch

[arlo at torproject.org]

commit 414686e58eac89c9c903ce722cbc3cce54f47696
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Sat Mar 19 07:54:43 2016 -0400

    Rebase xmpp-gtalk-resource.patch
---
 projects/instantbird/xmpp-gtalk-resource.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/projects/instantbird/xmpp-gtalk-resource.patch b/projects/instantbird/xmpp-gtalk-resource.patch
index e9432e4..a09d538 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
-@@ -95,7 +95,7 @@
-   getAccount: function(aImAccount) new GTalkAccount(this, aImAccount),
+@@ -96,7 +96,7 @@
+   getAccount: function(aImAccount) { return new GTalkAccount(this, aImAccount); },
    options: {
-     resource: {get label() _("options.resource"),
--               get default() XMPPDefaultResource}
+     resource: {get label() { return _("options.resource"); },
+-               get default() { return XMPPDefaultResource; }}
 +               default: "Instantbird"},
    },
-   get chatHasTopic() true,
+   get chatHasTopic() { return 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() _("options.resource"),
--               get default() XMPPDefaultResource},
+     resource: {get label() { return _("options.resource"); },
+-               get default() { return XMPPDefaultResource; }},
 +               default: "Instantbird"},
-     priority: {get label() _("options.priority"), default: 0},
+     priority: {get label() { return _("options.priority"); }, default: 0},
      connection_security: {
-       get label() _("options.connectionSecurity"),
+       get label() { return _("options.connectionSecurity"); },