[tor-messenger-build/master] Disable svg and mathml in content - tor-commits

1 Dec 2016

commit 612f40e441124281cceeb5b19112c2826d47f7ab
Author: Arlo Breault arlolra@gmail.com
Date:   Thu Dec 1 13:35:54 2016 -0800
Disable svg and mathml in content
---
 ChangeLog                                          |  1 +
 .../0001-Set-Tor-Messenger-preferences.patch       | 10 ++--
 ...0002-Trac-16489-Prevent-account-autologin.patch |  4 +-
 ...Support-Special-Characters-input-prompt-o.patch |  4 +-
 ...Better-error-reporting-for-failed-outgoin.patch |  4 +-
 .../0005-Trac-13312-OTR-over-Twitter-DMs.patch     |  4 +-
 ...-Fix-tab-strip-background-colour-on-OS-X..patch |  4 +-
 ...-XMPP-createConversation-should-handle-in.patch |  4 +-
 ...-Set-_userVCard-own-property-when-downloa.patch |  4 +-
 .../0009-XMPP-in-band-registration.patch           |  4 +-
 .../instantbird/0010-Remove-search-from-UI.patch   |  4 +-
 .../0011-Add-Tor-Messenger-branding.patch          |  4 +-
 projects/instantbird/0012-Account-picture.patch    |  4 +-
 .../0013-Modify-protocol-defaults.patch            |  4 +-
 .../instantbird/0014-Modify-IRC-defaults.patch     |  4 +-
 projects/instantbird/0015-Modify-themes.patch      |  4 +-
 .../instantbird/0016-Modify-XMPP-defaults.patch    |  4 +-
 projects/instantbird/0017-Remove-logging-UI.patch  |  4 +-
 projects/instantbird/0018-Cert-override.patch      |  4 +-
 .../0019-Display-all-traffic-over-Tor.patch        |  4 +-
 .../instantbird/0020-Trac-17480-Content-sink.patch |  4 +-
 .../0021-SASL-ECDSA-NIST256P-CHALLENGE.patch       |  4 +-
 ...-msg-is-not-defined-error-in-irc.js-chang.patch |  4 +-
 ...Contact-list-entries-should-adapt-their-h.patch |  4 +-
 ...1187281-Only-show-close-button-on-Windows.patch |  4 +-
 ...-Remove-old-Yahoo-Messenger-support.-r-al.patch |  4 +-
 ...-Use-built-in-functions-instead-of-an-svg.patch | 57 ++++++++++++++++++++++
 projects/instantbird/config                        |  1 +
 28 files changed, 112 insertions(+), 53 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e3f64e..8acb5fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ Tor Messenger 0.3.0b2 --
    * Use the THUNDERBIRD_45_5_1_RELEASE tag on comm-esr45
    * Update tor-browser to 6.0.7
    * Don't allow javascript: links in themes
+   * Disable svg and mathml in content
Tor Messenger 0.3.0b1 -- November 22, 2016
  * All Platforms
diff --git a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
index 2a75c3b..a2cdba5 100644
--- a/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
+++ b/projects/instantbird/0001-Set-Tor-Messenger-preferences.patch
@@ -1,14 +1,14 @@
-From 0df511dda30a868bc85824931ea0c4c56b1fbf03 Mon Sep 17 00:00:00 2001
+From f33a13f5e5f2fc0a696f93494e29163c531e53e6 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 19:48:41 -0700
-Subject: [PATCH 01/25] Set Tor Messenger preferences
+Subject: [PATCH 01/26] Set Tor Messenger preferences
---
  im/app/profile/all-instantbird.js | 406 +++++++++++++++++++++++++++++++++++---
  1 file changed, 384 insertions(+), 22 deletions(-)
diff --git a/im/app/profile/all-instantbird.js b/im/app/profile/all-instantbird.js
-index b7a397017..6fc2c90a7 100644
+index b7a397017..1ad0d6b95 100644
 --- a/im/app/profile/all-instantbird.js
 +++ b/im/app/profile/all-instantbird.js
 @@ -1,3 +1,47 @@
@@ -406,8 +406,8 @@ index b7a397017..6fc2c90a7 100644
 +pref("dom.mozTCPSocket.enabled", false);
 +
 +// Security slider
-+pref("svg.in-content.enabled", true);
-+pref("mathml.disabled", false);
++pref("svg.in-content.enabled", false);  // TM
++pref("mathml.disabled", true);  // TM
 +// Until we address at least the linkability concerns in #19417 let's disable
 +// asmjs.
 +pref("javascript.options.asmjs", false);
diff --git a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
index f13e124..b46aad2 100644
--- a/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
+++ b/projects/instantbird/0002-Trac-16489-Prevent-account-autologin.patch
@@ -1,7 +1,7 @@
-From 11b8b6e1d0a75e22558353d6faf07c705e624054 Mon Sep 17 00:00:00 2001
+From 758ef11f3849bb0ac8009477de16f3ad5f69fcae Mon Sep 17 00:00:00 2001
 From: Arlo Breault arlolra@gmail.com
 Date: Mon, 16 Nov 2015 20:37:53 -0800
-Subject: [PATCH 02/25] Trac 16489: Prevent account autologin
+Subject: [PATCH 02/26] Trac 16489: Prevent account autologin
---
  chat/components/src/imAccounts.js |  2 +-
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 ddb44bb..13c94f1 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,7 +1,7 @@
-From 7086cb8f65f506ec27767f2a2d03295b3e77b817 Mon Sep 17 00:00:00 2001
+From db8cc660b76c6a9f005a31dbb6ab6dc33aa63d09 Mon Sep 17 00:00:00 2001
 From: aleth aleth@instantbird.org
 Date: Sat, 30 Jan 2016 20:56:38 +0100
-Subject: [PATCH 03/25] Trac 17896: Support "Special Characters" input prompt
+Subject: [PATCH 03/26] Trac 17896: Support "Special Characters" input prompt
  on OS X
* Bug 1151784 - Add Edit menu to the conversation window on OS X. r=nhnt11,florian
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 9178fb3..9bae3b4 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,7 +1,7 @@
-From 00767571b5e29389a54897cbbf28efc3fe96f9ca Mon Sep 17 00:00:00 2001
+From a9bdb6d653c25a5e43e518a3120398c05cc6cefb Mon Sep 17 00:00:00 2001
 From: Arlo Breault arlolra@gmail.com
 Date: Tue, 2 Feb 2016 16:04:51 -0800
-Subject: [PATCH 04/25] Trac 17494: Better error reporting for failed outgoing
+Subject: [PATCH 04/26] Trac 17494: Better error reporting for failed outgoing
  messages
* Bug 1245325 - Better error reporting for failed outgoing messages. r=clokep
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 c48bc6b..b431c18 100644
--- a/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
+++ b/projects/instantbird/0005-Trac-13312-OTR-over-Twitter-DMs.patch
@@ -1,7 +1,7 @@
-From a9b62bbc374934c2910ce53fb0668659cec4e73b Mon Sep 17 00:00:00 2001
+From 6868f83d3fad91762838192d1e34005b153279ff Mon Sep 17 00:00:00 2001
 From: Arlo Breault arlolra@gmail.com
 Date: Tue, 15 Mar 2016 17:40:42 -0700
-Subject: [PATCH 05/25] Trac 13312: OTR over Twitter DMs
+Subject: [PATCH 05/26] Trac 13312: OTR over Twitter DMs
---
  chat/components/src/imConversations.js |   3 +-
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 26fcaa3..d43de67 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,7 +1,7 @@
-From 8e736ffd5f007847f305bda7dd44fca761e96a6f Mon Sep 17 00:00:00 2001
+From 3fdd9b978c8174124bbf68d414c448818b838473 Mon Sep 17 00:00:00 2001
 From: Nihanth Subramanya nhnt11@gmail.com
 Date: Sun, 9 Oct 2016 21:53:04 -0700
-Subject: [PATCH 06/25] Bug 1218193 - Fix tab strip background colour on OS X.
+Subject: [PATCH 06/26] Bug 1218193 - Fix tab strip background colour on OS X.
  r=aleth
---
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 071f916..7090f06 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,7 +1,7 @@
-From f709123309faa68e9b243b63ac548048731db0fd Mon Sep 17 00:00:00 2001
+From 27678323a56d55750f2c95babbea05c788aaa3ca Mon Sep 17 00:00:00 2001
 From: Arlo Breault arlolra@gmail.com
 Date: Sun, 9 Oct 2016 21:57:07 -0700
-Subject: [PATCH 07/25] Bug 1246431 - XMPP createConversation should handle
+Subject: [PATCH 07/26] Bug 1246431 - XMPP createConversation should handle
  incoming messages from the server properly. r=aleth
---
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 789cd5f..0d542a6 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,7 +1,7 @@
-From 9866b6d2ec361d987d6bdc48014427df7139ea6c Mon Sep 17 00:00:00 2001
+From 076859e81b50d9e108349b8f8813755c1394a22e Mon Sep 17 00:00:00 2001
 From: Arlo Breault arlolra@gmail.com
 Date: Sun, 28 Aug 2016 08:57:41 -0700
-Subject: [PATCH 08/25] Bug 1298574 - Set _userVCard own property when
+Subject: [PATCH 08/26] Bug 1298574 - Set _userVCard own property when
  downloading vCard fails. r=aleth
* This prevents an infinite req / res cycle.
diff --git a/projects/instantbird/0009-XMPP-in-band-registration.patch b/projects/instantbird/0009-XMPP-in-band-registration.patch
index bea0077..7568fa6 100644
--- a/projects/instantbird/0009-XMPP-in-band-registration.patch
+++ b/projects/instantbird/0009-XMPP-in-band-registration.patch
@@ -1,7 +1,7 @@
-From ddb8fa8041c1808676b277cbe405aeb970b466b6 Mon Sep 17 00:00:00 2001
+From 84761e5e917ef65fe5f41f37b1594b1958e0a132 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 18:42:25 -0700
-Subject: [PATCH 09/25] XMPP in-band registration
+Subject: [PATCH 09/26] XMPP in-band registration
---
  chat/locales/en-US/xmpp.properties                 |   5 +
diff --git a/projects/instantbird/0010-Remove-search-from-UI.patch b/projects/instantbird/0010-Remove-search-from-UI.patch
index 4fcde9a..8abae5c 100644
--- a/projects/instantbird/0010-Remove-search-from-UI.patch
+++ b/projects/instantbird/0010-Remove-search-from-UI.patch
@@ -1,7 +1,7 @@
-From b1c97ccedc4099704e06e3c1d676b7af7fe8dba0 Mon Sep 17 00:00:00 2001
+From 8afe25c91c32920f508823388384d08a9fffbafe Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 18:47:48 -0700
-Subject: [PATCH 10/25] Remove search from UI
+Subject: [PATCH 10/26] Remove search from UI
---
  im/content/nsContextMenu.js         | 18 +-----------------
diff --git a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
index f5a2c1a..c9bd8d1 100644
--- a/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
+++ b/projects/instantbird/0011-Add-Tor-Messenger-branding.patch
@@ -1,7 +1,7 @@
-From 9465dccf0297c300caf410f0e31ae49acbdf6a61 Mon Sep 17 00:00:00 2001
+From 30825fd3818b8aedbe9657cba44cc19367423178 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 18:56:27 -0700
-Subject: [PATCH 11/25] Add Tor Messenger branding
+Subject: [PATCH 11/26] Add Tor Messenger branding
---
  im/app/macbuild/Contents/Info.plist.in             |   2 +-
diff --git a/projects/instantbird/0012-Account-picture.patch b/projects/instantbird/0012-Account-picture.patch
index 3bac128..6e1f94d 100644
--- a/projects/instantbird/0012-Account-picture.patch
+++ b/projects/instantbird/0012-Account-picture.patch
@@ -1,7 +1,7 @@
-From a8276a289236cd8691b6dece5e4e11d2de7f34b4 Mon Sep 17 00:00:00 2001
+From 0e9be1b8cbc5a83deea99e27db548a5ee7f27595 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 19:24:09 -0700
-Subject: [PATCH 12/25] Account picture
+Subject: [PATCH 12/26] Account picture
---
  im/content/blist.xul | 3 +--
diff --git a/projects/instantbird/0013-Modify-protocol-defaults.patch b/projects/instantbird/0013-Modify-protocol-defaults.patch
index e8ad5a3..5abc1f8 100644
--- a/projects/instantbird/0013-Modify-protocol-defaults.patch
+++ b/projects/instantbird/0013-Modify-protocol-defaults.patch
@@ -1,7 +1,7 @@
-From a10101ffc21977f256ee4ecb7f73af71ab5d7426 Mon Sep 17 00:00:00 2001
+From 347131c4544a45138a92758b7d5e8367a1b88e53 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 19:25:34 -0700
-Subject: [PATCH 13/25] Modify protocol defaults
+Subject: [PATCH 13/26] Modify protocol defaults
* Top protocols
diff --git a/projects/instantbird/0014-Modify-IRC-defaults.patch b/projects/instantbird/0014-Modify-IRC-defaults.patch
index 92207a1..6ab7e0b 100644
--- a/projects/instantbird/0014-Modify-IRC-defaults.patch
+++ b/projects/instantbird/0014-Modify-IRC-defaults.patch
@@ -1,7 +1,7 @@
-From aa70417e8646c50aa85598d723acd2099d524a1e Mon Sep 17 00:00:00 2001
+From 284337da762e32ea77b46bfa7746468aacc8fb43 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 19:31:58 -0700
-Subject: [PATCH 14/25] Modify IRC defaults
+Subject: [PATCH 14/26] Modify IRC defaults
* ctcp ping
diff --git a/projects/instantbird/0015-Modify-themes.patch b/projects/instantbird/0015-Modify-themes.patch
index 9111fa7..d1028bb 100644
--- a/projects/instantbird/0015-Modify-themes.patch
+++ b/projects/instantbird/0015-Modify-themes.patch
@@ -1,7 +1,7 @@
-From b5c49b925dc1be8f8ae37e1f9f04c28020be7aa6 Mon Sep 17 00:00:00 2001
+From 73c0698dbb4858ec7e717c16e12e11838abc50e4 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 19:36:38 -0700
-Subject: [PATCH 15/25] Modify themes
+Subject: [PATCH 15/26] Modify themes
* theme extension updateh
diff --git a/projects/instantbird/0016-Modify-XMPP-defaults.patch b/projects/instantbird/0016-Modify-XMPP-defaults.patch
index 20a960c..3e95f90 100644
--- a/projects/instantbird/0016-Modify-XMPP-defaults.patch
+++ b/projects/instantbird/0016-Modify-XMPP-defaults.patch
@@ -1,7 +1,7 @@
-From 655f5e07585e180822e6a5a9d6d80f8cb1c4ab09 Mon Sep 17 00:00:00 2001
+From c3a34e12c701cf4d9181f59fcda39ac63bad886d Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 19:38:49 -0700
-Subject: [PATCH 16/25] Modify XMPP defaults
+Subject: [PATCH 16/26] Modify XMPP defaults
* xmpp-default-domain
diff --git a/projects/instantbird/0017-Remove-logging-UI.patch b/projects/instantbird/0017-Remove-logging-UI.patch
index 6c4504e..40a18cc 100644
--- a/projects/instantbird/0017-Remove-logging-UI.patch
+++ b/projects/instantbird/0017-Remove-logging-UI.patch
@@ -1,7 +1,7 @@
-From cafc07fcac360ccd5248a6798dfb7706788fe4fe Mon Sep 17 00:00:00 2001
+From dbc831c825fbbde2bd942a79d5ee85f24e441580 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 19:50:48 -0700
-Subject: [PATCH 17/25] Remove logging UI
+Subject: [PATCH 17/26] Remove logging UI
---
  im/content/preferences/privacy.xul | 20 --------------------
diff --git a/projects/instantbird/0018-Cert-override.patch b/projects/instantbird/0018-Cert-override.patch
index c6b033a..ceb7528 100644
--- a/projects/instantbird/0018-Cert-override.patch
+++ b/projects/instantbird/0018-Cert-override.patch
@@ -1,7 +1,7 @@
-From 20e5243b68e4ed887acee55954affdb33fbac423 Mon Sep 17 00:00:00 2001
+From fc7f9fc5c8cd7c3dc149d36d491f0e4adfc638c2 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 19:56:46 -0700
-Subject: [PATCH 18/25] Cert override
+Subject: [PATCH 18/26] Cert override
---
  im/app/profile/cert_override.txt | 3 +++
diff --git a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
index 90fa7fd..6ba8e52 100644
--- a/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
+++ b/projects/instantbird/0019-Display-all-traffic-over-Tor.patch
@@ -1,7 +1,7 @@
-From 9def66dc758ccdfb179d47b3b6cce29531a38018 Mon Sep 17 00:00:00 2001
+From a9f32ef8f285f390ff1b8766a886056676ac57e3 Mon Sep 17 00:00:00 2001
 From: Sukhbir Singh sukhbir@torproject.org
 Date: Mon, 10 Oct 2016 19:58:31 -0700
-Subject: [PATCH 19/25] Display all traffic over Tor
+Subject: [PATCH 19/26] Display all traffic over Tor
---
  im/content/accountWizard.xul                          | 2 ++
diff --git a/projects/instantbird/0020-Trac-17480-Content-sink.patch b/projects/instantbird/0020-Trac-17480-Content-sink.patch
index 7c52152..9b33973 100644
--- a/projects/instantbird/0020-Trac-17480-Content-sink.patch
+++ b/projects/instantbird/0020-Trac-17480-Content-sink.patch
@@ -1,7 +1,7 @@
-From 5f45a049d67f31ed6cc753ad539ddb9144ff7ddf Mon Sep 17 00:00:00 2001
+From d8f1585096eb0fccc8c749721e38d424eaf82cca Mon Sep 17 00:00:00 2001
 From: Arlo Breault arlolra@gmail.com
 Date: Wed, 5 Oct 2016 11:09:25 -0700
-Subject: [PATCH 20/25] Trac 17480: Content sink
+Subject: [PATCH 20/26] Trac 17480: Content sink
---
  chat/modules/imContentSink.jsm     | 33 ++++++---------------------------
diff --git a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
index dd6a659..6d25e3e 100644
--- a/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
+++ b/projects/instantbird/0021-SASL-ECDSA-NIST256P-CHALLENGE.patch
@@ -1,7 +1,7 @@
-From 049adcc7cc828fdb3e68467cc8acc57778f2deaf Mon Sep 17 00:00:00 2001
+From 80e0274c4fb2884c2c10b4c54e0c4a2a8b4feda7 Mon Sep 17 00:00:00 2001
 From: Arlo Breault arlolra@gmail.com
 Date: Sun, 2 Oct 2016 08:46:55 -0700
-Subject: [PATCH 21/25] SASL ECDSA-NIST256P-CHALLENGE
+Subject: [PATCH 21/26] SASL ECDSA-NIST256P-CHALLENGE
---
  chat/components/src/imAccounts.js |    1 +
diff --git a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
index d02fe5a..388a388 100644
--- a/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
+++ b/projects/instantbird/0022-Bug-1313137-msg-is-not-defined-error-in-irc.js-chang.patch
@@ -1,7 +1,7 @@
-From 1ec3e4cd7e820648086460bfbadc26cf43e7945f Mon Sep 17 00:00:00 2001
+From 6650334d6bb7d5fad2c3519141577a359f809181 Mon Sep 17 00:00:00 2001
 From: aleth aleth@instantbird.org
 Date: Wed, 26 Oct 2016 20:16:58 +0200
-Subject: [PATCH 22/25] Bug 1313137 - "msg is not defined" error in
+Subject: [PATCH 22/26] Bug 1313137 - "msg is not defined" error in
  irc.js:changeBuddyNick. r=clokep
--HG--
diff --git a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
index 9c3886a..2ded572 100644
--- a/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
+++ b/projects/instantbird/0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
@@ -1,7 +1,7 @@
-From b7d7b3ed7b73f1b46a6334e3d358bace8228b732 Mon Sep 17 00:00:00 2001
+From 5b9e4e065607f314bcc2af04e3fbb839e27ea567 Mon Sep 17 00:00:00 2001
 From: aleth aleth@instantbird.org
 Date: Thu, 12 May 2016 15:10:43 +0200
-Subject: [PATCH 23/25] Bug 954368 - Contact list entries should adapt their
+Subject: [PATCH 23/26] Bug 954368 - Contact list entries should adapt their
  height to the actual font size. r=florian
--HG--
diff --git a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch
index 17f631d..abd54c8 100644
--- a/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch
+++ b/projects/instantbird/0024-Bug-1187281-Only-show-close-button-on-Windows.patch
@@ -1,7 +1,7 @@
-From 0331be740d906116cc07dceae0d6163442e4e844 Mon Sep 17 00:00:00 2001
+From e8f8d6a0b2eddf4af186f5e87fccf53d3a00ca6a Mon Sep 17 00:00:00 2001
 From: Arlo Breault arlolra@gmail.com
 Date: Sat, 5 Nov 2016 14:55:20 -0700
-Subject: [PATCH 24/25] Bug 1187281 - Only show "close" button on Windows
+Subject: [PATCH 24/26] Bug 1187281 - Only show "close" button on Windows
---
  im/content/accounts.xul | 2 ++
diff --git a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
index 4ba93ef..a806bc4 100644
--- a/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
+++ b/projects/instantbird/0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
@@ -1,7 +1,7 @@
-From 81b882c16f8216a889e1d6beb1035d8187a59df7 Mon Sep 17 00:00:00 2001
+From c300ecb9482610b71f0418a8f14afba6b9474923 Mon Sep 17 00:00:00 2001
 From: Patrick Cloke clokep@gmail.com
 Date: Wed, 9 Nov 2016 09:03:49 -0800
-Subject: [PATCH 25/25] Bug 1316000 - Remove old Yahoo! Messenger support.
+Subject: [PATCH 25/26] Bug 1316000 - Remove old Yahoo! Messenger support.
  r=aleth
---
diff --git a/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch b/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
new file mode 100644
index 0000000..2e9bde6
--- /dev/null
+++ b/projects/instantbird/0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
@@ -0,0 +1,57 @@
+From 915c02bbdb4032c513c0eeb43b36b56dcc006046 Mon Sep 17 00:00:00 2001
+From: Arlo Breault arlolra@gmail.com
+Date: Thu, 1 Dec 2016 13:25:42 -0800
+Subject: [PATCH 26/26] Bug 1321641 - Use built-in functions instead of an svg
+ for bubbles filter
+
+---
+ im/themes/jar.mn                       |  1 -
+ im/themes/messages/bubbles/bubbles.svg | 10 ----------
+ im/themes/messages/bubbles/main.css    |  2 +-
+ 3 files changed, 1 insertion(+), 12 deletions(-)
+ delete mode 100644 im/themes/messages/bubbles/bubbles.svg
+
+diff --git a/im/themes/jar.mn b/im/themes/jar.mn
+index e422619d4..e39f5dcd8 100644
+--- a/im/themes/jar.mn
++++ b/im/themes/jar.mn
+@@ -268,7 +268,6 @@ instantbird.jar:
+ 	skin/classic/instantbird/messages/bubbles/Bitmaps/minus.png             (messages/bubbles/Bitmaps/minus.png)
+ 	skin/classic/instantbird/messages/bubbles/Bitmaps/plus-hover.png        (messages/bubbles/Bitmaps/plus-hover.png)
+ 	skin/classic/instantbird/messages/bubbles/Bitmaps/plus.png              (messages/bubbles/Bitmaps/plus.png)
+-	skin/classic/instantbird/messages/bubbles/bubbles.svg                   (messages/bubbles/bubbles.svg)
+ 	skin/classic/instantbird/messages/bubbles/Footer.html                   (messages/bubbles/Footer.html)
+ 	skin/classic/instantbird/messages/bubbles/Incoming/Content.html         (messages/bubbles/Incoming/Content.html)
+ 	skin/classic/instantbird/messages/bubbles/Incoming/Context.html         (messages/bubbles/Incoming/Context.html)
+diff --git a/im/themes/messages/bubbles/bubbles.svg b/im/themes/messages/bubbles/bubbles.svg
+deleted file mode 100644
+index 963521eca..000000000
+--- a/im/themes/messages/bubbles/bubbles.svg
++++ /dev/null
+@@ -1,10 +0,0 @@
+-<?xml version="1.0"?>
+-<!-- This Source Code Form is subject to the terms of the Mozilla Public
+-   - License, v. 2.0. If a copy of the MPL was not distributed with this
+-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+-
+-<svg xmlns="http://www.w3.org/2000/svg">
+-  <filter id="desaturate">
+-    <feColorMatrix type="saturate" values="0.4"/>
+-  </filter>
+-</svg>
+diff --git a/im/themes/messages/bubbles/main.css b/im/themes/messages/bubbles/main.css
+index 15ba97346..4488c30bb 100644
+--- a/im/themes/messages/bubbles/main.css
++++ b/im/themes/messages/bubbles/main.css
+@@ -40,7 +40,7 @@ p {
+ }
+ 
+ .bubble.context:not(:hover) {
+-  filter: url("bubbles.svg#desaturate");
++  filter: saturate(40%);
+ }
+ 
+ .indicator {
+-- 
+2.11.0
+
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 6c07a69..cc1cdc7 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -87,6 +87,7 @@ input_files:
   - filename: 0023-Bug-954368-Contact-list-entries-should-adapt-their-h.patch
   - filename: 0024-Bug-1187281-Only-show-close-button-on-Windows.patch
   - filename: 0025-Bug-1316000-Remove-old-Yahoo-Messenger-support.-r-al.patch
+  - filename: 0026-Bug-1321641-Use-built-in-functions-instead-of-an-svg.patch
   - filename: mozconfig-common
   - filename: 'mozconfig-[% c("var/osname") %]'
     name: mozconfig

    