[tor-messenger-build/master] Some more rebased patches (IRC, XMPP default servers) - tor-commits

2 Sep 2015

commit 304c28fef74fe6f8616454da3435f6e9c59829b2
Author: Sukhbir Singh sukhbir@torproject.org
Date:   Wed Sep 2 10:10:09 2015 -0400
Some more rebased patches (IRC, XMPP default servers)
---
 projects/instantbird/config                    |    4 +---
 projects/instantbird/irc-default-server.patch  |   13 +++++++++++++
 projects/instantbird/irc.patch                 |   13 -------------
 projects/instantbird/xmpp-default-domain.patch |   15 +++------------
 projects/instantbird/xmpp-resource.patch       |   13 -------------
 5 files changed, 17 insertions(+), 41 deletions(-)

diff --git a/projects/instantbird/config b/projects/instantbird/config
index 2089829..59bab4b 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -68,8 +68,7 @@ input_files:
     pkg_type: src
   - filename: spi-cacert.der
   - filename: preferences.patch
-  - filename: irc.patch
-  - filename: gtalk-resource.patch
+  - filename: irc-default-server.patch
   - filename: top-protocols.patch
   - filename: disable-links.patch
   - filename: account-picture.patch
@@ -81,7 +80,6 @@ input_files:
   - filename: xmpp-default-domain.patch
   - filename: xmppRegister.js
   - filename: xmppRegister.xul
-  - filename: xmpp-resource.patch
   - filename: version.patch
   - filename: search-context-menu.patch
   - filename: search-preferences-xul.patch
diff --git a/projects/instantbird/irc-default-server.patch b/projects/instantbird/irc-default-server.patch
new file mode 100644
index 0000000..9ad53b0
--- /dev/null
+++ b/projects/instantbird/irc-default-server.patch
@@ -0,0 +1,13 @@
+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 = {
+ 
+   usernameSplits: [
+     {get label() { return _("options.server"); }, separator: "@",
+-     defaultValue: "chat.freenode.net", reverse: true}
++     defaultValue: "", reverse: true}
+   ],
+ 
+   options: {
diff --git a/projects/instantbird/irc.patch b/projects/instantbird/irc.patch
deleted file mode 100644
index 29632dd..0000000
--- a/projects/instantbird/irc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chat/protocols/irc/irc.js b/chat/protocols/irc/irc.js
-index c581e2d..cf0d085 100644
---- a/chat/protocols/irc/irc.js
-+++ b/chat/protocols/irc/irc.js
-@@ -1916,7 +1916,7 @@ ircProtocol.prototype = {
- 
-   usernameSplits: [
-     {get label() _("options.server"), separator: "@",
--     defaultValue: "chat.freenode.net", reverse: true}
-+     defaultValue: "", reverse: true}
-   ],
- 
-   options: {
diff --git a/projects/instantbird/xmpp-default-domain.patch b/projects/instantbird/xmpp-default-domain.patch
index f9480f0..d2ebe9c 100644
--- a/projects/instantbird/xmpp-default-domain.patch
+++ b/projects/instantbird/xmpp-default-domain.patch
@@ -1,22 +1,13 @@
 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
-@@ -24,17 +24,17 @@ XMPPProtocol.prototype = {
-   __proto__: GenericProtocolPrototype,
-   get normalizedName() "jabber",
-   get name() "XMPP",
-   get iconBaseURI() "chrome://prpl-jabber/skin/",
-   getAccount: function(aImAccount) new XMPPAccount(this, aImAccount),
+@@ -31,7 +31,7 @@ XMPPProtocol.prototype = {
usernameSplits: [
-     {get label() _("options.domain"), separator: "@",
+     {get label() { return _("options.domain"); }, separator: "@",
 -     defaultValue: "jabber.org", reverse: true}
 +     defaultValue: "", reverse: true}
    ],
options: {
-     resource: {get label() _("options.resource"),
-                get default() XMPPDefaultResource},
-     priority: {get label() _("options.priority"), default: 0},
-     connection_security: {
-       get label() _("options.connectionSecurity"),
diff --git a/projects/instantbird/xmpp-resource.patch b/projects/instantbird/xmpp-resource.patch
deleted file mode 100644
index 3e861da..0000000
--- a/projects/instantbird/xmpp-resource.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/chat/protocols/xmpp/xmpp.js b/chat/protocols/xmpp/xmpp.js
-index f99a238..a35f99a 100644
---- a/chat/protocols/xmpp/xmpp.js
-+++ b/chat/protocols/xmpp/xmpp.js
-@@ -34,7 +34,7 @@ XMPPProtocol.prototype = {
- 
-   options: {
-     resource: {get label() _("options.resource"),
--               get default() XMPPDefaultResource},
-+               default: "Instantbird"},
-     priority: {get label() _("options.priority"), default: 0},
-     connection_security: {
-       get label() _("options.connectionSecurity"),

    