commit 97ae8072d970b3b0dc465cf8d9095dfc92e3c4aa
Author: Arlo Breault <arlo...@gmail.com>
Date: Wed Mar 8 18:49:18 2017 -0800
Restore the ability to auto login, but default to off
* Trac 21634
---
...0002-Trac-16489-Prevent-account-autologin.patch | 121 ---------------------
...c-21634-Autologin-default-should-be-false.patch | 39 +++++++
...Support-Special-Characters-input-prompt-o.patch | 2 +-
...Better-error-reporting-for-failed-outgoin.patch | 2 +-
.../0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +-
...-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +-
...-XMPP-createConversation-should-handle-in.patch | 2 +-
.../0008-XMPP-in-band-registration.patch | 6 +-
.../instantbird/0009-Remove-search-from-UI.patch | 2 +-
.../0010-Add-Tor-Messenger-branding.patch | 2 +-
projects/instantbird/0011-Account-picture.patch | 2 +-
.../0012-Modify-protocol-defaults.patch | 4 +-
.../instantbird/0013-Modify-IRC-defaults.patch | 2 +-
projects/instantbird/0014-Modify-themes.patch | 2 +-
.../instantbird/0015-Modify-XMPP-defaults.patch | 2 +-
projects/instantbird/0016-Remove-logging-UI.patch | 2 +-
projects/instantbird/0017-Cert-override.patch | 2 +-
.../0018-Display-all-traffic-over-Tor.patch | 4 +-
.../instantbird/0019-Trac-17480-Content-sink.patch | 2 +-
.../0020-SASL-ECDSA-NIST256P-CHALLENGE.patch | 2 +-
...-msg-is-not-defined-error-in-irc.js-chang.patch | 2 +-
...Contact-list-entries-should-adapt-their-h.patch | 2 +-
...1187281-Only-show-close-button-on-Windows.patch | 2 +-
...-Remove-old-Yahoo-Messenger-support.-r-al.patch | 2 +-
...-Use-built-in-functions-instead-of-an-svg.patch | 2 +-
...-Add-a-pref-to-disable-JavaScript-in-brow.patch | 2 +-
projects/instantbird/config | 2 +-
27 files changed, 68 insertions(+), 150 deletions(-)
diff --git
a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
deleted file mode 100644
index de0f39c..0000000
--- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 8b87a9f3db3ce327b85bd1fcb3306ae49f3c9478 Mon Sep 17 00:00:00 2001
-From: Arlo Breault <arlo...@gmail.com>
-Date: Mon, 16 Nov 2015 20:37:53 -0800
-Subject: [PATCH 02/26] Trac 16489: Prevent account autologin
-
----
- chat/components/src/imAccounts.js | 2 +-
- im/content/account.xml | 4 ----
- im/content/accountWizard.js | 11 +----------
- im/content/accountWizard.xul | 2 --
- im/content/preferences/main.xul | 18 ------------------
- 5 files changed, 2 insertions(+), 35 deletions(-)
-
-diff --git a/chat/components/src/imAccounts.js
b/chat/components/src/imAccounts.js
-index c13c6100d..5bfea57f2 100644
---- a/chat/components/src/imAccounts.js
-+++ b/chat/components/src/imAccounts.js
-@@ -588,7 +588,7 @@ imAccount.prototype = {
- },
-
- get autoLogin() {
-- let autoLogin = true;
-+ let autoLogin = false;
- try {
- autoLogin = this.prefBranch.getBoolPref(kPrefAccountAutoLogin);
- } catch (e) { }
-diff --git a/im/content/account.xml b/im/content/account.xml
-index e06331875..78195b71f 100644
---- a/im/content/account.xml
-+++ b/im/content/account.xml
-@@ -41,10 +41,6 @@
- accesskey="&certmgr.addException.accesskey;"/>
- <xul:spacer flex="1"/>
- </xul:vbox>
-- <xul:checkbox label="&account.autoSignOn.label;" dir="reverse"
-- xbl:inherits="checked=autologin" class="autoSignOn"
-- accesskey="&account.autoSignOn.accesskey;"
-- oncommand="gAccountManager.autologin()"/>
- </xul:hbox>
- <xul:hbox flex="1" class="account-buttons" anonid="buttons"
- xbl:inherits="autologin"/>
-diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js
-index 73707c9e2..ed3b8f0f7 100644
---- a/im/content/accountWizard.js
-+++ b/im/content/accountWizard.js
-@@ -442,22 +442,13 @@ var accountWizard = {
- throw "unknown type";
- }
- }
-- let autologin = this.getValue("connectAutomatically");
-- acc.autoLogin = autologin;
-+ acc.autoLogin = false;
-
- if (this.proto.usePurpleProxy)
- acc.proxyInfo = this.proxy;
-
- acc.save();
-
-- try {
-- if (autologin)
-- acc.connect();
-- } catch (e) {
-- // If the connection fails (for example if we are currently in
-- // offline mode), we still want to close the account wizard
-- }
--
- if (window.opener) {
- let am = window.opener.gAccountManager;
- if (am)
-diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
-index 5fa5b8293..9eb5352a6 100644
---- a/im/content/accountWizard.xul
-+++ b/im/content/accountWizard.xul
-@@ -137,8 +137,6 @@
- </columns>
- <rows id="summaryRows"/>
- </grid>
-- <separator/>
-- <checkbox id="connectAutomatically" label=
"&accountSummary.connectAutomatically.label;" checked="true"/>
- </wizardpage>
-
- </wizard>
-diff --git a/im/content/preferences/main.xul b/im/content/preferences/main.xul
-index e5f7fb659..5e0024d86 100644
---- a/im/content/preferences/main.xul
-+++ b/im/content/preferences/main.xul
-@@ -20,7 +20,6 @@
- <script type="application/javascript"
src="chrome://instantbird/content/preferences/main.js"/>
-
- <preferences id="mainPreferences">
-- <preference id="messenger.startup.action"
name="messenger.startup.action" type="int"/>
- <preference id="messenger.options.playSounds.blist"
name="messenger.options.playSounds.blist" type="bool"/>
- <preference id="messenger.options.playSounds.message"
name="messenger.options.playSounds.message" type="bool"/>
- <preference id="messenger.options.getAttentionOnNewMessages"
name="messenger.options.getAttentionOnNewMessages" type="bool"/>
-@@ -33,23 +32,6 @@
- <preference id="messenger.options.notifyOfNewMessages"
name="messenger.options.notifyOfNewMessages" type="bool"/>
- </preferences>
-
-- <!-- Startup -->
-- <groupbox id="startupGroup">
-- <caption label="&startup.label;"/>
--
-- <hbox align="center">
-- <label value="&startupAction.label;"
accesskey="&startupAction.accesskey;"
-- control="messengerStartupAction"/>
-- <menulist id="messengerStartupAction"
preference="messenger.startup.action">
-- <menupopup>
-- <menuitem label="&startupOffline.label;" value="0"/>
-- <menuitem label="&startupConnectAuto.label;" value="1"/>
-- </menupopup>
-- </menulist>
-- </hbox>
-- </groupbox>
--
--
- <groupbox id="accountsMgrGroup" orient="horizontal" align="center">
- <caption label="&accountsMgr.label;"/>
-
---
-2.12.0
-
diff --git
a/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch
b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch
new file mode 100644
index 0000000..1be2892
--- /dev/null
+++
b/projects/instantbird/0002-Trac-21634-Autologin-default-should-be-false.patch
@@ -0,0 +1,39 @@
+From 5dc74f402183115a4d60d69c96bcd770f794c014 Mon Sep 17 00:00:00 2001
+From: Arlo Breault <arlo...@gmail.com>
+Date: Mon, 16 Nov 2015 20:37:53 -0800
+Subject: [PATCH 02/26] Trac 21634: Autologin default should be false
+
+---
+ chat/components/src/imAccounts.js | 2 +-
+ im/content/accountWizard.xul | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chat/components/src/imAccounts.js
b/chat/components/src/imAccounts.js
+index c13c6100d..5bfea57f2 100644
+--- a/chat/components/src/imAccounts.js
++++ b/chat/components/src/imAccounts.js
+@@ -588,7 +588,7 @@ imAccount.prototype = {
+ },
+
+ get autoLogin() {
+- let autoLogin = true;
++ let autoLogin = false;
+ try {
+ autoLogin = this.prefBranch.getBoolPref(kPrefAccountAutoLogin);
+ } catch (e) { }
+diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
+index 5fa5b8293..f0933af7f 100644
+--- a/im/content/accountWizard.xul
++++ b/im/content/accountWizard.xul
+@@ -138,7 +138,7 @@
+ <rows id="summaryRows"/>
+ </grid>
+ <separator/>
+- <checkbox id="connectAutomatically" label=
"&accountSummary.connectAutomatically.label;" checked="true"/>
++ <checkbox id="connectAutomatically" label=
"&accountSummary.connectAutomatically.label;" checked="false"/>
+ </wizardpage>
+
+ </wizard>
+--
+2.12.0
+
diff --git
a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
index 8a92f7c..559f95d 100644
---
a/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
+++
b/projects/instantbird/0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
@@ -1,4 +1,4 @@
-From c719171fd2ec910bebc030061c4961dc79c90a46 Mon Sep 17 00:00:00 2001
+From bee69d70cfbb69967da3a6457d232177d70af26b Mon Sep 17 00:00:00 2001
From: aleth <al...@instantbird.org>
Date: Sat, 30 Jan 2016 20:56:38 +0100
Subject: [PATCH 03/26] Trac 17896: Support "Special Characters" input prompt
diff --git
a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
index 189ab74..d8f48d2 100644
---
a/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
+++
b/projects/instantbird/0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
@@ -1,4 +1,4 @@
-From c29e5366baa017fe3eb91042c91f729d9b1da0e0 Mon Sep 17 00:00:00 2001
+From 31c4a6075ae676f0e2600efe20aad0ca79228d29 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlo...@gmail.com>
Date: Tue, 2 Feb 2016 16:04:51 -0800
Subject: [PATCH 04/26] Trac 17494: Better error reporting for failed outgoing
diff --git a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
index 9119e39..aee57bb 100644
--- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
+++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
@@ -1,4 +1,4 @@
-From 85b00c12b5d2420adf77a2043c80a06ce5ca828d Mon Sep 17 00:00:00 2001
+From 8021b15b4da53e14b9b595d370dd0a2b24306d31 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlo...@gmail.com>
Date: Tue, 15 Mar 2016 17:40:42 -0700
Subject: [PATCH 05/26] Trac 13312: OTR over Twitter DMs
diff --git
a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch
b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch
index a2f0b67..29ddbc8 100644
---
a/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch
+++
b/projects/instantbird/0006-Bug-1218193-Fix-tab-strip-background-colour-on-OS-X..patch
@@ -1,4 +1,4 @@
-From 66f222db745b848a0ff24238218b0ca9563fe264 Mon Sep 17 00:00:00 2001
+From dcc285760341f0e9584866addbb0152c97e5321e Mon Sep 17 00:00:00 2001
From: Nihanth Subramanya <nhn...@gmail.com>
Date: Sun, 9 Oct 2016 21:53:04 -0700
Subject: [PATCH 06/26] Bug 1218193 - Fix tab strip background colour on OS X.
diff --git
a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch
b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch
index 028734d..bb97f5e 100644
---
a/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch
+++
b/projects/instantbird/0007-Bug-1246431-XMPP-createConversation-should-handle-in.patch
@@ -1,4 +1,4 @@
-From 172ba8233c54438d15e523e4d4c8e5864d06a65d Mon Sep 17 00:00:00 2001
+From 5955ea03c2000d832b2939fdcf148b08f702380c Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlo...@gmail.com>
Date: Sun, 9 Oct 2016 21:57:07 -0700
Subject: [PATCH 07/26] Bug 1246431 - XMPP createConversation should handle
diff --git a/projects/instantbird/0008-XMPP-in-band-registration.patch
b/projects/instantbird/0008-XMPP-in-band-registration.patch
index a363160..5365372 100644
--- a/projects/instantbird/0008-XMPP-in-band-registration.patch
+++ b/projects/instantbird/0008-XMPP-in-band-registration.patch
@@ -1,4 +1,4 @@
-From 72b0df30953c3e7cb52ecf01ca3d6009d558e326 Mon Sep 17 00:00:00 2001
+From 3c4237848553f5915a821cab2dc86ac75d7bf826 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 18:42:25 -0700
Subject: [PATCH 08/26] XMPP in-band registration
@@ -150,7 +150,7 @@ index 24618ee0c..246ec2b7c 100644
this.ERROR("Unexpected stanza " + aStanza.localName + ", expected
'features'");
this._networkError(_("connection.error.incorrectResponse"));
diff --git a/im/content/accountWizard.js b/im/content/accountWizard.js
-index ed3b8f0f7..7c26d0d6e 100644
+index 73707c9e2..889c06908 100644
--- a/im/content/accountWizard.js
+++ b/im/content/accountWizard.js
@@ -119,6 +119,12 @@ var accountWizard = {
@@ -176,7 +176,7 @@ index ed3b8f0f7..7c26d0d6e 100644
let option = this.prefs[i];
let opt = option.opt;
diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
-index 9eb5352a6..759f42b38 100644
+index f0933af7f..de9d0d809 100644
--- a/im/content/accountWizard.xul
+++ b/im/content/accountWizard.xul
@@ -65,6 +65,7 @@
diff --git a/projects/instantbird/0009-Remove-search-from-UI.patch
b/projects/instantbird/0009-Remove-search-from-UI.patch
index 1761343..adfef6c 100644
--- a/projects/instantbird/0009-Remove-search-from-UI.patch
+++ b/projects/instantbird/0009-Remove-search-from-UI.patch
@@ -1,4 +1,4 @@
-From 3996cffb7e430eee24676c63901c6e9175c18131 Mon Sep 17 00:00:00 2001
+From e217dc3951c7a1a2559bf04866e0e5c186631d03 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 18:47:48 -0700
Subject: [PATCH 09/26] Remove search from UI
diff --git a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch
b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch
index 3a4d4db..bc29647 100644
--- a/projects/instantbird/0010-Add-Tor-Messenger-branding.patch
+++ b/projects/instantbird/0010-Add-Tor-Messenger-branding.patch
@@ -1,4 +1,4 @@
-From 0374dbfb3906a74d562827eb94a378c10ad7c26f Mon Sep 17 00:00:00 2001
+From 958bf64a3a272cf190a08fe1e2a3ead98b05c0c3 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 18:56:27 -0700
Subject: [PATCH 10/26] Add Tor Messenger branding
diff --git a/projects/instantbird/0011-Account-picture.patch
b/projects/instantbird/0011-Account-picture.patch
index a99459d..5cd62c9 100644
--- a/projects/instantbird/0011-Account-picture.patch
+++ b/projects/instantbird/0011-Account-picture.patch
@@ -1,4 +1,4 @@
-From 71fdc6505cb36968cd518bc351ca72a210c5570e Mon Sep 17 00:00:00 2001
+From c11815bef7688c982eba290aeb4243cd90157bf1 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 19:24:09 -0700
Subject: [PATCH 11/26] Account picture
diff --git a/projects/instantbird/0012-Modify-protocol-defaults.patch
b/projects/instantbird/0012-Modify-protocol-defaults.patch
index 1794037..75102e6 100644
--- a/projects/instantbird/0012-Modify-protocol-defaults.patch
+++ b/projects/instantbird/0012-Modify-protocol-defaults.patch
@@ -1,4 +1,4 @@
-From 26996669f40ef665317af1943ae191a131da8a64 Mon Sep 17 00:00:00 2001
+From 945f99a48e5b6c2cd3ae47c166ee81fcb80ad9b6 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 19:25:34 -0700
Subject: [PATCH 12/26] Modify protocol defaults
@@ -12,7 +12,7 @@ Subject: [PATCH 12/26] Modify protocol defaults
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
-index 759f42b38..a3069061a 100644
+index de9d0d809..cce8a1ba9 100644
--- a/im/content/accountWizard.xul
+++ b/im/content/accountWizard.xul
@@ -50,7 +50,7 @@
diff --git a/projects/instantbird/0013-Modify-IRC-defaults.patch
b/projects/instantbird/0013-Modify-IRC-defaults.patch
index fe3fded..de14b8f 100644
--- a/projects/instantbird/0013-Modify-IRC-defaults.patch
+++ b/projects/instantbird/0013-Modify-IRC-defaults.patch
@@ -1,4 +1,4 @@
-From f325d825f3193abd400864d6b7878f92ff3e6083 Mon Sep 17 00:00:00 2001
+From 50e63aa0881f5c7b53d4df031c1634d78d5a52b8 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 19:31:58 -0700
Subject: [PATCH 13/26] Modify IRC defaults
diff --git a/projects/instantbird/0014-Modify-themes.patch
b/projects/instantbird/0014-Modify-themes.patch
index 67e94dd..6a0a254 100644
--- a/projects/instantbird/0014-Modify-themes.patch
+++ b/projects/instantbird/0014-Modify-themes.patch
@@ -1,4 +1,4 @@
-From b2636f3e3d067947ac37b01cfe89fd481ffb5992 Mon Sep 17 00:00:00 2001
+From 5dbad67d76f4aa17773d84ebb4d9b275ecde5696 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 19:36:38 -0700
Subject: [PATCH 14/26] Modify themes
diff --git a/projects/instantbird/0015-Modify-XMPP-defaults.patch
b/projects/instantbird/0015-Modify-XMPP-defaults.patch
index aab6a4d..c32b797 100644
--- a/projects/instantbird/0015-Modify-XMPP-defaults.patch
+++ b/projects/instantbird/0015-Modify-XMPP-defaults.patch
@@ -1,4 +1,4 @@
-From 354cc159f590b52487356b9f8a78680b098c6fdd Mon Sep 17 00:00:00 2001
+From 615a33df16f01fb31edda347f0da1189c6ab2275 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 19:38:49 -0700
Subject: [PATCH 15/26] Modify XMPP defaults
diff --git a/projects/instantbird/0016-Remove-logging-UI.patch
b/projects/instantbird/0016-Remove-logging-UI.patch
index 9770c0a..8d36046 100644
--- a/projects/instantbird/0016-Remove-logging-UI.patch
+++ b/projects/instantbird/0016-Remove-logging-UI.patch
@@ -1,4 +1,4 @@
-From 6cf79bd3bd255f6020ff00e62a1f38509d46dfa0 Mon Sep 17 00:00:00 2001
+From addbd96ff280d076cc33cd2684351e3953261ac8 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 19:50:48 -0700
Subject: [PATCH 16/26] Remove logging UI
diff --git a/projects/instantbird/0017-Cert-override.patch
b/projects/instantbird/0017-Cert-override.patch
index 5a3d403..190830e 100644
--- a/projects/instantbird/0017-Cert-override.patch
+++ b/projects/instantbird/0017-Cert-override.patch
@@ -1,4 +1,4 @@
-From f7137b50efc2d533e08e1829af173c68d30b7878 Mon Sep 17 00:00:00 2001
+From 0663d5a36f26573f57492f59212dd3838eeb202d Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 19:56:46 -0700
Subject: [PATCH 17/26] Cert override
diff --git a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch
b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch
index ab82e0b..1f1d0e2 100644
--- a/projects/instantbird/0018-Display-all-traffic-over-Tor.patch
+++ b/projects/instantbird/0018-Display-all-traffic-over-Tor.patch
@@ -1,4 +1,4 @@
-From 56a3cfefb45ab3b7d26d64c6d2738674c824555d Mon Sep 17 00:00:00 2001
+From 6783f32dd427882b0d4208ddbfe7726d1df691ca Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukh...@torproject.org>
Date: Mon, 10 Oct 2016 19:58:31 -0700
Subject: [PATCH 18/26] Display all traffic over Tor
@@ -9,7 +9,7 @@ Subject: [PATCH 18/26] Display all traffic over Tor
2 files changed, 3 insertions(+)
diff --git a/im/content/accountWizard.xul b/im/content/accountWizard.xul
-index a3069061a..3c3a4179b 100644
+index cce8a1ba9..fcc5eaa01 100644
--- a/im/content/accountWizard.xul
+++ b/im/content/accountWizard.xul
@@ -39,6 +39,8 @@
diff --git a/projects/instantbird/0019-Trac-17480-Content-sink.patch
b/projects/instantbird/0019-Trac-17480-Content-sink.patch
index 8d187bc..4762c7d 100644
--- a/projects/instantbird/0019-Trac-17480-Content-sink.patch
+++ b/projects/instantbird/0019-Trac-17480-Content-sink.patch
@@ -1,4 +1,4 @@
-From 6224bb7a78370452761f28c4842f4de156af298f Mon Sep 17 00:00:00 2001
+From 12cc9af695761d8ec46c74f75f7ed556f7511b58 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlo...@gmail.com>
Date: Wed, 5 Oct 2016 11:09:25 -0700
Subject: [PATCH 19/26] Trac 17480: Content sink
diff --git a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch
b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch
index 9a66360..8e4b220 100644
--- a/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch
+++ b/projects/instantbird/0020-SASL-ECDSA-NIST256P-CHALLENGE.patch
@@ -1,4 +1,4 @@
-From 6ae664ad609f5a10929d40af5ddfff8ae9d30a69 Mon Sep 17 00:00:00 2001
+From df852a62c5a50a1277f8ccfa7791081ccb89b8a3 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlo...@gmail.com>
Date: Sun, 2 Oct 2016 08:46:55 -0700
Subject: [PATCH 20/26] SASL ECDSA-NIST256P-CHALLENGE
diff --git
a/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
b/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
index ea06316..7882034 100644
---
a/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
+++
b/projects/instantbird/0021-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
@@ -1,4 +1,4 @@
-From d7f5e0ae90ce980566466a2bab1556f606320843 Mon Sep 17 00:00:00 2001
+From 83615f349e491a0aad08fb944c7167bbdd300bfc Mon Sep 17 00:00:00 2001
From: aleth <al...@instantbird.org>
Date: Wed, 26 Oct 2016 20:16:58 +0200
Subject: [PATCH 21/26] Bug 1313137 - "msg is not defined" error in
diff --git
a/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
b/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
index 7cc420e..6167d70 100644
---
a/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
+++
b/projects/instantbird/0022-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
@@ -1,4 +1,4 @@
-From d10d5ffbb0bb535e2776d77fd51cbb0c26890fcc Mon Sep 17 00:00:00 2001
+From 76c8fe4359c6195611de41816a9f5c10ecbbcef9 Mon Sep 17 00:00:00 2001
From: aleth <al...@instantbird.org>
Date: Thu, 12 May 2016 15:10:43 +0200
Subject: [PATCH 22/26] Bug 954368 - Contact list entries should adapt their
diff --git
a/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch
b/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch
index de44447..14fd6ce 100644
---
a/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch
+++
b/projects/instantbird/0023-Bug-1187281-Only-show-close-button-on-Windows.patch
@@ -1,4 +1,4 @@
-From df663502bb3f128fbb560f8d027a68ada6ba52cf Mon Sep 17 00:00:00 2001
+From 3202882e5ae047c5492f45d3d2ec40e965e21bf2 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlo...@gmail.com>
Date: Sat, 5 Nov 2016 14:55:20 -0700
Subject: [PATCH 23/26] Bug 1187281 - Only show "close" button on Windows
diff --git
a/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
b/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
index 333eade..fd2d1ef 100644
---
a/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
+++
b/projects/instantbird/0024-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
@@ -1,4 +1,4 @@
-From 7f4e87091ebfc9728d8655dd5a9b6b8f646a2357 Mon Sep 17 00:00:00 2001
+From a1ddac93a12d3ec0943828944389a09e112929eb Mon Sep 17 00:00:00 2001
From: Patrick Cloke <clo...@gmail.com>
Date: Wed, 9 Nov 2016 09:03:49 -0800
Subject: [PATCH 24/26] Bug 1316000 - Remove old Yahoo! Messenger support.
diff --git
a/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
b/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
index fa83e6c..aff7ef5 100644
---
a/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
+++
b/projects/instantbird/0025-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
@@ -1,4 +1,4 @@
-From 5f5f16fa1b41dd7a35ad1da327a52c3467f3ed47 Mon Sep 17 00:00:00 2001
+From 88d7f895904bac92b6e110816baeb41e4cf93a56 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlo...@gmail.com>
Date: Thu, 1 Dec 2016 13:25:42 -0800
Subject: [PATCH 25/26] Bug 1321641 - Use built-in functions instead of an svg
diff --git
a/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
b/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
index b8800a3..d712059 100644
---
a/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
+++
b/projects/instantbird/0026-Bug-1321420-Add-a-pref-to-disable-JavaScript-in-brow.patch
@@ -1,4 +1,4 @@
-From dce889af9ec054849a5483561a2d20df002ceaaa Mon Sep 17 00:00:00 2001
+From 0aedf14b3813f345814eba086b7b4732081d45c5 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlo...@gmail.com>
Date: Thu, 1 Dec 2016 14:34:51 -0800
Subject: [PATCH 26/26] Bug 1321420 - Add a pref to disable JavaScript in
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 0a481c1..d73cf8c 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -63,7 +63,7 @@ targets:
- sqlite3
input_files:
- filename: 0001-Set-Tor-Messenger-preferences.patch
- - filename: 0002-Trac-16489-Prevent-account-autologin.patch
+ - filename: 0002-Trac-21634-Autologin-default-should-be-false.patch
- filename: 0003-Trac-17896-Support-Special-Characters-input-prompt-o.patch
- filename: 0004-Trac-17494-Better-error-reporting-for-failed-outgoin.patch
- filename: 0005-Trac-13312-OTR-over-Twitter-DMs.patch
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
