[tor-commits] [tor-messenger-build/master] Update resource patches

[sukhbir@xxxxxxxxxxxxxx]

commit 0d3452ddfcbe66df2751755e57693bd76879c06d
Author: Sukhbir Singh <sukhbir@xxxxxxxxxxxxxx>
Date:   Wed Sep 23 23:55:36 2015 -0400

    Update resource patches
---
 projects/instantbird/gtalk-resource.patch      |   13 -------------
 projects/instantbird/xmpp-gtalk-resource.patch |    4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/projects/instantbird/gtalk-resource.patch b/projects/instantbird/gtalk-resource.patch
deleted file mode 100644
index 59006ee..0000000
--- a/projects/instantbird/gtalk-resource.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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}")
diff --git a/projects/instantbird/xmpp-gtalk-resource.patch b/projects/instantbird/xmpp-gtalk-resource.patch
index c9fcd59..1318eb5 100644
--- a/projects/instantbird/xmpp-gtalk-resource.patch
+++ b/projects/instantbird/xmpp-gtalk-resource.patch
@@ -6,7 +6,7 @@ diff --git a/chat/protocols/gtalk/gtalk.js b/chat/protocols/gtalk/gtalk.js
    options: {
      resource: {get label() { return _("options.resource"); },
 -               get default() { return XMPPDefaultResource; }}
-+               default: "Instantbird"}}
++               default: "Instantbird"},
    },
    get chatHasTopic() { return true; },
    classID: Components.ID("{38a224c1-6748-49a9-8ab2-efc362b1000d}")
@@ -18,7 +18,7 @@ diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js
    options: {
      resource: {get label() { return _("options.resource"); },
 -               get default() { return XMPPDefaultResource; }},
-+               default: "Instanbird"}},
++               default: "Instanbird"},
      priority: {get label() { return _("options.priority"); }, default: 0},
      connection_security: {
        get label() { return _("options.connectionSecurity"); },

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits