commit c3f190e3be82a2e12e236986474f8c270ba2635b
Author: Arlo Breault <arlolra(a)gmail.com>
Date: Tue Oct 18 21:34:58 2016 -0700
Enable SVG
* TB's patch "Bug 12827: Create preference to disable SVG" adds a
preference `svg.in-content.enabled` that we need to toggle in order
for the scrollback to display after bringing a conversation back from
on hold.
---
.../instantbird/0001-Set-Tor-Messenger-preferences.patch | 13 ++++++++-----
.../0002-Trac-16489-Prevent-account-autologin.patch | 2 +-
...ac-17896-Support-Special-Characters-input-prompt-o.patch | 2 +-
...ac-17494-Better-error-reporting-for-failed-outgoin.patch | 2 +-
.../instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch | 2 +-
...g-1218193-Fix-tab-strip-background-colour-on-OS-X..patch | 2 +-
...g-1246431-XMPP-createConversation-should-handle-in.patch | 2 +-
...g-1298574-Set-_userVCard-own-property-when-downloa.patch | 2 +-
projects/instantbird/0009-XMPP-in-band-registration.patch | 2 +-
projects/instantbird/0010-Remove-search-from-UI.patch | 2 +-
projects/instantbird/0011-Add-Tor-Messenger-branding.patch | 2 +-
projects/instantbird/0012-Account-picture.patch | 2 +-
projects/instantbird/0013-Modify-protocol-defaults.patch | 2 +-
projects/instantbird/0014-Modify-IRC-defaults.patch | 2 +-
projects/instantbird/0015-Modify-themes.patch | 2 +-
projects/instantbird/0016-Modify-XMPP-defaults.patch | 2 +-
projects/instantbird/0017-Remove-logging-UI.patch | 2 +-
projects/instantbird/0018-Cert-override.patch | 2 +-
.../instantbird/0019-Display-all-traffic-over-Tor.patch | 2 +-
projects/instantbird/0020-Trac-17480-Content-sink.patch | 2 +-
20 files changed, 27 insertions(+), 24 deletions(-)
diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index 96f3f5b..be19543 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,14 +1,14 @@
-From 81e0dfcc4197e987a8c64cce36b3cda48e84fe54 Mon Sep 17 00:00:00 2001
+From bfa4576ff8e6291a0cd293e05ac48b2a91c6a3c1 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 19:48:41 -0700
Subject: [PATCH 01/20] Set Tor Messenger preferences
---
- im/app/profile/all-instantbird.js | 107 +++++++++++++++++++++++++++++++-------
- 1 file changed, 87 insertions(+), 20 deletions(-)
+ im/app/profile/all-instantbird.js | 110 +++++++++++++++++++++++++++++++-------
+ 1 file changed, 90 insertions(+), 20 deletions(-)
diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js
-index b7a3970..86f0559 100644
+index b7a3970..eb1423f 100644
--- a/im/app/profile/all-instantbird.js
+++ b/im/app/profile/all-instantbird.js
@@ -28,7 +28,7 @@ pref("general.autoScroll", true);
@@ -110,7 +110,7 @@ index b7a3970..86f0559 100644
// We have an Error Console menu item by default so let's display chrome errors
pref("javascript.options.showInConsole", true);
-@@ -300,14 +302,79 @@ pref("browser.tabs.tabClipWidth", 140);
+@@ -300,14 +302,82 @@ pref("browser.tabs.tabClipWidth", 140);
// 3 at the end of the tabstrip
pref("browser.tabs.closeButtons", 1);
@@ -187,6 +187,9 @@ index b7a3970..86f0559 100644
+// Disable hardware acceleration
+pref("gfx.direct2d.disabled", true);
+pref("layers.acceleration.disabled", true);
++// Enable SVG, for the TB patch,
++// "Bug 12827: Create preference to disable SVG."
++pref("svg.in-content.enabled", true);
+
+// Other Updates
+pref("app.update.promptWaitTime", 3600);
diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
index b3e386e..2ef8307 100644
--- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
+++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
@@ -1,4 +1,4 @@
-From 9cb6308cee43524e5b9368d6fc2f0b862dde0a3e Mon Sep 17 00:00:00 2001
+From 2f9785b7fb8fba1dae99f914a7500bac41d4a17b Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra(a)gmail.com>
Date: Mon, 16 Nov 2015 20:37:53 -0800
Subject: [PATCH 02/20] Trac 16489: Prevent account autologin
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 df362aa..100def4 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 ae27272d58c8f3654ba23b1329f07f0dc8fe5a10 Mon Sep 17 00:00:00 2001
+From fa84f77e4b3c3091aec5a479f862aa8cdb12de6a Mon Sep 17 00:00:00 2001
From: aleth <aleth(a)instantbird.org>
Date: Sat, 30 Jan 2016 20:56:38 +0100
Subject: [PATCH 03/20] 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 4c3501d..2a4797c 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 13ffc7769be983fbd7668ad40f716683351b249f Mon Sep 17 00:00:00 2001
+From 7fcda7da8eee17eccae8e25a7a24f0b7127fc3af Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra(a)gmail.com>
Date: Tue, 2 Feb 2016 16:04:51 -0800
Subject: [PATCH 04/20] 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 0743dde..72cf05a 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 ea824468b2e4084a40863c934cc0ce72ac2d7076 Mon Sep 17 00:00:00 2001
+From 2a8dc4c8043aeae007b4e727c54137f4ae90f3dd Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra(a)gmail.com>
Date: Tue, 15 Mar 2016 17:40:42 -0700
Subject: [PATCH 05/20] 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 2634d9d..e70ebdf 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 820516967b23c191fda8c33b74260808838acb7d Mon Sep 17 00:00:00 2001
+From 10e196e6c4e26d74baacba3e2b0f367a062b0287 Mon Sep 17 00:00:00 2001
From: Nihanth Subramanya <nhnt11(a)gmail.com>
Date: Sun, 9 Oct 2016 21:53:04 -0700
Subject: [PATCH 06/20] 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 c80e60d..a2ee757 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 f05bcdd1b1554e5acf3ce5ac95de62d2f2341361 Mon Sep 17 00:00:00 2001
+From ecee8301b2187ea25e582d15e3d02bec5d29078e Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra(a)gmail.com>
Date: Sun, 9 Oct 2016 21:57:07 -0700
Subject: [PATCH 07/20] Bug 1246431 - XMPP createConversation should handle
diff --git a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
index ab5aef1..0ecfe1a 100644
--- a/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
+++ b/projects/instantbird/0008-Bug-1298574-Set-_userVCard-own-property-when-downloa.patch
@@ -1,4 +1,4 @@
-From 4fff3e33c39807680dab5961e6577fa128237921 Mon Sep 17 00:00:00 2001
+From 899378439d41d0ee36cba761edf43e4329cd9c07 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra(a)gmail.com>
Date: Sun, 28 Aug 2016 08:57:41 -0700
Subject: [PATCH 08/20] Bug 1298574 - Set _userVCard own property when
diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch
index 1912917..00d9a74 100644
--- a/projects/instantbird/0009-XMPP-in-band-registration.patch
+++ b/projects/instantbird/0009-XMPP-in-band-registration.patch
@@ -1,4 +1,4 @@
-From b773d4ee2dc099c684840cc1aef6984572e3dd8d Mon Sep 17 00:00:00 2001
+From 1e0665d52f89f61af5dd07fc1d0c31dd90c0a483 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 18:42:25 -0700
Subject: [PATCH 09/20] XMPP in-band registration
diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch
index 434ab0f..440fd3f 100644
--- a/projects/instantbird/0010-Remove-search-from-UI.patch
+++ b/projects/instantbird/0010-Remove-search-from-UI.patch
@@ -1,4 +1,4 @@
-From 43116629bf42352a656ae1b77b2774d2898b1905 Mon Sep 17 00:00:00 2001
+From a9aa4108eceba8f5d4472b27ba7f0f3223d535bc Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 18:47:48 -0700
Subject: [PATCH 10/20] Remove search from UI
diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
index 1ec97fa..af71f34 100644
--- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
+++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
@@ -1,4 +1,4 @@
-From 321249d5df13876ec3eca14d764e05d11ba5f353 Mon Sep 17 00:00:00 2001
+From ce1cba5c29e974399693c6b3dbd02b372a8a6ab3 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 18:56:27 -0700
Subject: [PATCH 11/20] Add Tor Messenger branding
diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch
index 1ba2aa3..b6ecc4d 100644
--- a/projects/instantbird/0012-Account-picture.patch
+++ b/projects/instantbird/0012-Account-picture.patch
@@ -1,4 +1,4 @@
-From 378d544200db0ef0c4800117826a988f54f88c88 Mon Sep 17 00:00:00 2001
+From a40ca36edcb6b2be8ed958e39479998a8fe4fbc3 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 19:24:09 -0700
Subject: [PATCH 12/20] Account picture
diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch
index 9f4870e..98f7bee 100644
--- a/projects/instantbird/0013-Modify-protocol-defaults.patch
+++ b/projects/instantbird/0013-Modify-protocol-defaults.patch
@@ -1,4 +1,4 @@
-From db0abd7e21663ed4cf92495bf7502b02c882c007 Mon Sep 17 00:00:00 2001
+From 82b8069f3b5eef5d6ed8a87e8b122e2b0eae3a76 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 19:25:34 -0700
Subject: [PATCH 13/20] Modify protocol defaults
diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch
index 5d010db..2d6f979 100644
--- a/projects/instantbird/0014-Modify-IRC-defaults.patch
+++ b/projects/instantbird/0014-Modify-IRC-defaults.patch
@@ -1,4 +1,4 @@
-From f5c55c3d901d8d2174da47078d85622ca6885f9c Mon Sep 17 00:00:00 2001
+From 14b1768d06adce5dd85dd56ea4c89984d420c36e Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 19:31:58 -0700
Subject: [PATCH 14/20] Modify IRC defaults
diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch
index 451eb9d..588f36e 100644
--- a/projects/instantbird/0015-Modify-themes.patch
+++ b/projects/instantbird/0015-Modify-themes.patch
@@ -1,4 +1,4 @@
-From 278bce580b808cc6881a3ba5cacee69b8ecb7a13 Mon Sep 17 00:00:00 2001
+From 8f6fad682f3fc785e324faf086e5248b54e50f2e Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 19:36:38 -0700
Subject: [PATCH 15/20] Modify themes
diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch
index ac58b3a..b85fff7 100644
--- a/projects/instantbird/0016-Modify-XMPP-defaults.patch
+++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch
@@ -1,4 +1,4 @@
-From 4199685bb157c9248701353d1da77d43b507f45c Mon Sep 17 00:00:00 2001
+From 7002186f102f329431ad1f1afce87af75f7a4570 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 19:38:49 -0700
Subject: [PATCH 16/20] Modify XMPP defaults
diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch
index a217b9b..ba010bb 100644
--- a/projects/instantbird/0017-Remove-logging-UI.patch
+++ b/projects/instantbird/0017-Remove-logging-UI.patch
@@ -1,4 +1,4 @@
-From e2f35f7b0b8eba6fcfeee629e6bc37f50c9ee153 Mon Sep 17 00:00:00 2001
+From af2bff6a7f15123c567b4c911b5842423fee0514 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 19:50:48 -0700
Subject: [PATCH 17/20] Remove logging UI
diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch
index e995a9d..7d19cf6 100644
--- a/projects/instantbird/0018-Cert-override.patch
+++ b/projects/instantbird/0018-Cert-override.patch
@@ -1,4 +1,4 @@
-From d97d6ee26187ae8c682a5b25a8772741fae19be2 Mon Sep 17 00:00:00 2001
+From da09cc5555865e5f86a4627d9ad1fd9de4dd392b Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 19:56:46 -0700
Subject: [PATCH 18/20] Cert override
diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
index ef68228..b8e5d79 100644
--- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
+++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
@@ -1,4 +1,4 @@
-From 21ee6198dcd40ce7af5e0baa44c0740114dcfaf4 Mon Sep 17 00:00:00 2001
+From b4e33411b5743601307009ce6e31235fccb57ba3 Mon Sep 17 00:00:00 2001
From: Sukhbir Singh <sukhbir(a)torproject.org>
Date: Mon, 10 Oct 2016 19:58:31 -0700
Subject: [PATCH 19/20] Display all traffic over Tor
diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch
index 8279ed5..fc34c67 100644
--- a/projects/instantbird/0020-Trac-17480-Content-sink.patch
+++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch
@@ -1,4 +1,4 @@
-From fe0c48901086991eb1ba35b1ee391284547cb4dd Mon Sep 17 00:00:00 2001
+From 2194d4caace6d18b2a33a57df3618019b9bc77d8 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra(a)gmail.com>
Date: Wed, 5 Oct 2016 11:09:25 -0700
Subject: [PATCH 20/20] Trac 17480: Content sink